From 9217d106c32b52ea774519de09d7e70d6dc10589 Mon Sep 17 00:00:00 2001 From: Michal Polovka Date: Mon, 31 May 2021 14:43:28 +0200 Subject: [PATCH 1/2] ipatests: test_installation: Skip KRA test if lib389 cannot be imported KRA instance import depends on lib389 package, which is not always installed and that results in failure. This fix skips relevant test if the import is not possible. Signed-off-by: Michal Polovka --- ipatests/test_integration/test_installation.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index 02bcd6f542f..391ecb7b7b2 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -34,7 +34,12 @@ from ipatests.test_integration.base import IntegrationTest from ipatests.test_integration.test_caless import CALessBase, ipa_certs_cleanup from ipaplatform import services -from ipaserver.install import krainstance + +skip_test_kra = False +try: + from ipaserver.install import krainstance +except ImportError: + skip_test_kra = True config = get_global_config() @@ -1251,6 +1256,7 @@ def test_install_master(self): def test_install_dns(self): tasks.install_dns(self.master) + @pytest.mark.skipif(skip_test_kra, reason="lib389 could not be imported") def test_kra_certs_renewal(self): """ Test that the KRA subsystem certificates renew properly From 093742a852e6e0b0bbaffe867f3c9d0c56ebaab1 Mon Sep 17 00:00:00 2001 From: Michal Polovka Date: Mon, 31 May 2021 14:51:39 +0200 Subject: [PATCH 2/2] temp commit --- .freeipa-pr-ci.yaml | 2 +- ipatests/prci_definitions/temp_commit.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml index abcf8c5b634..80656690080 120000 --- a/.freeipa-pr-ci.yaml +++ b/.freeipa-pr-ci.yaml @@ -1 +1 @@ -ipatests/prci_definitions/gating.yaml \ No newline at end of file +ipatests/prci_definitions/temp_commit.yaml \ No newline at end of file diff --git a/ipatests/prci_definitions/temp_commit.yaml b/ipatests/prci_definitions/temp_commit.yaml index 26e4b0e58b9..9323266e7fd 100644 --- a/ipatests/prci_definitions/temp_commit.yaml +++ b/ipatests/prci_definitions/temp_commit.yaml @@ -61,14 +61,14 @@ jobs: timeout: 1800 topology: *build - fedora-latest/temp_commit: + fedora-latest/temp_commit_test_installation: requires: [fedora-latest/build] priority: 50 job: class: RunPytest args: build_url: '{fedora-latest/build_url}' - test_suite: test_integration/test_REPLACEME.py + test_suite: test_integration/test_installation.py template: *ci-master-latest - timeout: 3600 + timeout: 7200 topology: *master_1repl_1client