IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI tests: ignore disconnected domain level 1 topology on IPA master teardown

Browse Source 
Reviewed-By: Oleg Fayans <ofayans@redhat.com>
This commit is contained in:
Martin Babinsky 2015-12-04 18:24:31 +01:00 committed by Martin Basti
parent 848912ae31
commit 35fae355cc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipatests/test_integration/tasks.py
View File

@ -343,7 +343,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
'--setup-dns', '--setup-dns',
'--forwarder', replica.config.dns_forwarder '--forwarder', replica.config.dns_forwarder
]) ])
if domainlevel(master) == 0: if domainlevel(master) == DOMAIN_LEVEL_0:
apply_common_fixes(replica) apply_common_fixes(replica)
# prepare the replica file on master and put it to replica, AKA "old way" # prepare the replica file on master and put it to replica, AKA "old way"
replica_prepare(master, replica) replica_prepare(master, replica)
@ -365,7 +365,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
"-p", replica.config.dirman_password, "-p", replica.config.dirman_password,
"-U", "-U",
] ]
if domainlevel(master) == 0: if domainlevel(master) == DOMAIN_LEVEL_0:
args.append(replica_filename) args.append(replica_filename)
replica.run_command(args) replica.run_command(args)
@ -615,11 +615,16 @@ def kinit_admin(host):
stdin_text=host.config.admin_password) stdin_text=host.config.admin_password)
def uninstall_master(host): def uninstall_master(host, ignore_topology_disconnect=True):
host.collect_log(paths.IPASERVER_UNINSTALL_LOG) host.collect_log(paths.IPASERVER_UNINSTALL_LOG)
uninstall_cmd = ['ipa-server-install', '--uninstall', '-U']
host.run_command(['ipa-server-install', '--uninstall', '-U'], host_domain_level = domainlevel(host)
raiseonerr=False)
if ignore_topology_disconnect and host_domain_level != DOMAIN_LEVEL_0:
uninstall_cmd.append('--ignore-topology-disconnect')
host.run_command(uninstall_cmd, raiseonerr=False)
host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'], host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'],
raiseonerr=False) raiseonerr=False)
host.run_command(['rm', '-rf', host.run_command(['rm', '-rf',