From 43dde143a7af775312f748e15117050b0e291467 Mon Sep 17 00:00:00 2001 From: Felipe Barreto Date: Jul 31 2018 11:40:13 +0000 Subject: Making nigthly test definition editable by FreeIPA's contributors Now the test definition of nightly tests will be on freeipa repo. The definition that's used on every PR (previously as .freeipa-pr-ci.yaml) is in ipatests/prci_definitions/gating and the .freeipa-pr-ci.yaml file is just a symlink to the real file. In the same dir there is also nightly_master and nightly_rawhide, both to be used in nightly tests. Divided test_topology.py into 3 subtests. Bumped vagrant template to version 0.1.6 This PR is the result of discussion on freeipa-devel mailing list [1]. [1] https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/4VAWJ4SFKKBFFICDLQCTXJWRRQHIYJLL/ Reviewed-By: Michal Reznik Reviewed-By: Michal Reznik --- diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml deleted file mode 100644 index 7164f9d..0000000 --- a/.freeipa-pr-ci.yaml +++ /dev/null @@ -1,244 +0,0 @@ -topologies: - build: &build - name: build - cpu: 2 - memory: 3800 - master_1repl: &master_1repl - name: master_1repl - cpu: 4 - memory: 5750 - master_1repl_1client: &master_1repl_1client - name: master_1repl_1client - cpu: 4 - memory: 6700 - -jobs: - fedora-28/build: - requires: [] - priority: 100 - job: - class: Build - args: - git_repo: '{git_repo}' - git_refspec: '{git_refspec}' - template: &ci-master-f28 - name: freeipa/ci-master-f28 - version: 0.1.5 - timeout: 1800 - topology: *build - - fedora-28/simple_replication: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_simple_replication.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/caless: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_caless.py::TestServerReplicaCALessToCAFull - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/external_ca_1: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_external_ca.py::TestExternalCA - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/external_ca_2: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_external_ca.py::TestSelfExternalSelf test_integration/test_external_ca.py::TestExternalCAInstall - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_topologies: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_topologies.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_sudo: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_sudo.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/test_commands: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_commands.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_kerberos_flags: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_kerberos_flags.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/test_http_kdc_proxy: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_http_kdc_proxy.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/test_forced_client_enrolment: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_forced_client_reenrollment.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/test_advise: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_advise.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_testconfig: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_testconfig.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_service_permissions: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_service_permissions.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_netgroup: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_netgroup.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/test_vault: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_vault.py - template: *ci-master-f28 - timeout: 4500 - topology: *master_1repl - - fedora-28/test_authconfig: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_authselect.py - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl_1client - - fedora-28/replica_promotion: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_replica_promotion.py::TestSubCAkeyReplication - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl - - fedora-28/dnssec: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_dnssec.py::TestInstallDNSSECFirst - template: *ci-master-f28 - timeout: 3600 - topology: *master_1repl diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml new file mode 120000 index 0000000..abcf8c5 --- /dev/null +++ b/.freeipa-pr-ci.yaml @@ -0,0 +1 @@ +ipatests/prci_definitions/gating.yaml \ No newline at end of file diff --git a/ipatests/setup.py b/ipatests/setup.py index 7cad279..5f780ca 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -50,6 +50,7 @@ if __name__ == '__main__': ], scripts=['ipa-run-tests', 'ipa-test-config', 'ipa-test-task'], package_data={ + 'ipatests': ['prci_definitions/*'], 'ipatests.test_install': ['*.update'], 'ipatests.test_integration': ['scripts/*'], 'ipatests.test_ipaclient': ['data/*/*/*'],