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 Test: add setup_kra options into install scripts

Browse Source 
https://fedorahosted.org/freeipa/ticket/5302

Reviewed-By: Milan Kubik <mkubik@redhat.com>
This commit is contained in:
Martin Basti 2015-10-06 20:28:18 +02:00
parent 61bdbd6e47
commit 5f3784520b
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipatests/test_integration/tasks.py
View File

@ -246,7 +246,7 @@ def enable_replication_debugging(host):
stdin_text=logging_ldif) stdin_text=logging_ldif)
def install_master(host, setup_dns=True): def install_master(host, setup_dns=True, setup_kra=False):
host.collect_log(paths.IPASERVER_INSTALL_LOG) host.collect_log(paths.IPASERVER_INSTALL_LOG)
host.collect_log(paths.IPACLIENT_INSTALL_LOG) host.collect_log(paths.IPACLIENT_INSTALL_LOG)
inst = host.domain.realm.replace('.', '-') inst = host.domain.realm.replace('.', '-')
@ -273,10 +273,23 @@ def install_master(host, setup_dns=True):
enable_replication_debugging(host) enable_replication_debugging(host)
setup_sssd_debugging(host) setup_sssd_debugging(host)
if setup_kra:
args = [
"ipa-kra-install",
"-p", host.config.dirman_password,
"-U",
]
host.run_command(args)
kinit_admin(host) kinit_admin(host)
def install_replica(master, replica, setup_ca=True, setup_dns=False): def get_replica_filename(replica):
return os.path.join(replica.config.test_dir, 'replica-info.gpg')
def install_replica(master, replica, setup_ca=True, setup_dns=False,
setup_kra=False):
replica.collect_log(paths.IPAREPLICA_INSTALL_LOG) replica.collect_log(paths.IPAREPLICA_INSTALL_LOG)
replica.collect_log(paths.IPAREPLICA_CONNCHECK_LOG) replica.collect_log(paths.IPAREPLICA_CONNCHECK_LOG)
@ -289,8 +302,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False):
replica.hostname]) replica.hostname])
replica_bundle = master.get_file_contents( replica_bundle = master.get_file_contents(
paths.REPLICA_INFO_GPG_TEMPLATE % replica.hostname) paths.REPLICA_INFO_GPG_TEMPLATE % replica.hostname)
replica_filename = os.path.join(replica.config.test_dir, replica_filename = get_replica_filename(replica)
'replica-info.gpg')
replica.put_file_contents(replica_filename, replica_bundle) replica.put_file_contents(replica_filename, replica_bundle)
args = ['ipa-replica-install', '-U', args = ['ipa-replica-install', '-U',
'-p', replica.config.dirman_password, '-p', replica.config.dirman_password,
@ -309,6 +321,16 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False):
enable_replication_debugging(replica) enable_replication_debugging(replica)
setup_sssd_debugging(replica) setup_sssd_debugging(replica)
if setup_kra:
assert setup_ca, "CA must be installed on replica with KRA"
args = [
"ipa-kra-install",
replica_filename,
"-p", replica.config.dirman_password,
"-U",
]
replica.run_command(args)
kinit_admin(replica) kinit_admin(replica)

8
ipatests/test_integration/test_backup_and_restore.py
View File

@ -354,13 +354,7 @@ class BaseBackupAndRestoreWithKRA(IntegrationTest):
@classmethod @classmethod
def install(cls, mh): def install(cls, mh):
tasks.install_master(cls.master, setup_dns=True) tasks.install_master(cls.master, setup_dns=True, setup_kra=True)
args = [
"ipa-kra-install",
"-p", cls.master.config.dirman_password,
"-U",
]
cls.master.run_command(args)
def _full_backup_restore_with_vault(self, reinstall=False): def _full_backup_restore_with_vault(self, reinstall=False):
with restore_checker(self.master): with restore_checker(self.master):