From 886506f89f6b86f16fbbc118a3716ff9a44e0bfa Mon Sep 17 00:00:00 2001 From: Sergey Orlov Date: Tue, 9 Mar 2021 12:53:28 +0100 Subject: [PATCH] ipatests: use proper template for TestMaskInstall TestMaskInstall is a usual integration tests and should install freeipa server during test run. "ipaserver" template provides pre-install freeipa server and is intended for use with webui and xmlrpc tests. Reviewed-By: Francois Cami --- ipatests/prci_definitions/nightly_latest.yaml | 2 +- ipatests/prci_definitions/nightly_latest_389ds.yaml | 2 +- ipatests/prci_definitions/nightly_latest_selinux.yaml | 2 +- ipatests/prci_definitions/nightly_latest_testing.yaml | 2 +- ipatests/prci_definitions/nightly_latest_testing_selinux.yaml | 2 +- ipatests/prci_definitions/nightly_previous.yaml | 2 +- ipatests/prci_definitions/nightly_rawhide.yaml | 2 +- ipatests/test_integration/test_installation.py | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ipatests/prci_definitions/nightly_latest.yaml b/ipatests/prci_definitions/nightly_latest.yaml index e8f0042a0..515d9ce17 100644 --- a/ipatests/prci_definitions/nightly_latest.yaml +++ b/ipatests/prci_definitions/nightly_latest.yaml @@ -1484,7 +1484,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *ci-master-latest timeout: 3600 - topology: *ipaserver + topology: *master_1repl fedora-latest/automember: requires: [fedora-latest/build] diff --git a/ipatests/prci_definitions/nightly_latest_389ds.yaml b/ipatests/prci_definitions/nightly_latest_389ds.yaml index f693a0627..89bd7e35a 100644 --- a/ipatests/prci_definitions/nightly_latest_389ds.yaml +++ b/ipatests/prci_definitions/nightly_latest_389ds.yaml @@ -558,7 +558,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *389ds-master-latest timeout: 3600 - topology: *ipaserver + topology: *master_1repl 389ds-fedora/automember: requires: [389ds-fedora/build] diff --git a/ipatests/prci_definitions/nightly_latest_selinux.yaml b/ipatests/prci_definitions/nightly_latest_selinux.yaml index 50115985a..10e88605f 100644 --- a/ipatests/prci_definitions/nightly_latest_selinux.yaml +++ b/ipatests/prci_definitions/nightly_latest_selinux.yaml @@ -1601,7 +1601,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *ci-master-latest timeout: 3600 - topology: *ipaserver + topology: *master_1repl fedora-latest/automember: requires: [fedora-latest/build] diff --git a/ipatests/prci_definitions/nightly_latest_testing.yaml b/ipatests/prci_definitions/nightly_latest_testing.yaml index 94c2ec1e8..fca64b194 100644 --- a/ipatests/prci_definitions/nightly_latest_testing.yaml +++ b/ipatests/prci_definitions/nightly_latest_testing.yaml @@ -1601,7 +1601,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *testing-master-latest timeout: 3600 - topology: *ipaserver + topology: *master_1repl testing-fedora/automember: requires: [testing-fedora/build] diff --git a/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml b/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml index bc6e60ac6..3b5a59e76 100644 --- a/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml +++ b/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml @@ -1718,7 +1718,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *testing-master-latest timeout: 3600 - topology: *ipaserver + topology: *master_1repl testing-fedora/automember: requires: [testing-fedora/build] diff --git a/ipatests/prci_definitions/nightly_previous.yaml b/ipatests/prci_definitions/nightly_previous.yaml index 7a170e306..3a86b04f6 100644 --- a/ipatests/prci_definitions/nightly_previous.yaml +++ b/ipatests/prci_definitions/nightly_previous.yaml @@ -1484,7 +1484,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *ci-master-previous timeout: 3600 - topology: *ipaserver + topology: *master_1repl fedora-previous/automember: requires: [fedora-previous/build] diff --git a/ipatests/prci_definitions/nightly_rawhide.yaml b/ipatests/prci_definitions/nightly_rawhide.yaml index 7e210008b..60c6cce1a 100644 --- a/ipatests/prci_definitions/nightly_rawhide.yaml +++ b/ipatests/prci_definitions/nightly_rawhide.yaml @@ -1574,7 +1574,7 @@ jobs: test_suite: test_integration/test_installation.py::TestMaskInstall template: *ci-master-frawhide timeout: 3600 - topology: *ipaserver + topology: *master_1repl fedora-rawhide/nfs: requires: [fedora-rawhide/build] diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index 1aa283f54..a50a59f1a 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -1354,8 +1354,7 @@ class TestMaskInstall(IntegrationTest): related ticket: https://pagure.io/freeipa/issue/7193 """ - - num_replicas = 0 + topology = 'star' @classmethod def install(cls, mh):