diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index e027d9443..c78e3968f 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -216,7 +216,7 @@ check: jobs: - openstack-tox-linters - - tripleo-ci-centos-9-content-provider-zed: + - tripleo-ci-centos-9-content-provider-wallaby: irrelevant-files: &branchful_ignored - ^.*\.md$ - ^.*\.rst$ @@ -241,19 +241,10 @@ - ^tripleo_common/tests/.*$ dependencies: - openstack-tox-linters - - tripleo-ci-centos-9-content-provider-wallaby: - irrelevant-files: *branchful_ignored - dependencies: - - openstack-tox-linters - tripleo-ci-centos-8-content-provider-train: irrelevant-files: *branchful_ignored dependencies: - openstack-tox-linters - - tripleo-ci-centos-9-containers-multinode-zed: &multi_consumer_job_zed - irrelevant-files: *branchful_ignored - vars: *multi_consumer_vars - dependencies: - - tripleo-ci-centos-9-content-provider-zed - tripleo-ci-centos-9-containers-multinode-wallaby: &multi_consumer_job_wallaby irrelevant-files: *branchful_ignored vars: *multi_consumer_vars @@ -267,13 +258,10 @@ gate: jobs: - - tripleo-ci-centos-9-content-provider-zed: - irrelevant-files: *branchful_ignored - tripleo-ci-centos-9-content-provider-wallaby: irrelevant-files: *branchful_ignored - tripleo-ci-centos-8-content-provider-train: irrelevant-files: *branchful_ignored - - tripleo-ci-centos-9-containers-multinode-zed: *multi_consumer_job_zed - tripleo-ci-centos-9-containers-multinode-wallaby: *multi_consumer_job_wallaby - tripleo-ci-centos-8-containers-multinode-train: *multi_consumer_job_train diff --git a/zuul.d/periodic.yaml b/zuul.d/periodic.yaml index 310ce088e..23e4f3c62 100644 --- a/zuul.d/periodic.yaml +++ b/zuul.d/periodic.yaml @@ -198,7 +198,6 @@ - tripleo-ci-centos-9-content-provider: &fips_force_non_periodic vars: force_non_periodic: true - - tripleo-ci-centos-9-content-provider-zed: *fips_force_non_periodic - tripleo-ci-centos-9-content-provider-wallaby: *fips_force_non_periodic - tripleo-ci-centos-9-standalone-fips: &fips_vars_periodic vars: &fips_consumer_vars @@ -229,15 +228,3 @@ - tripleo-ci-centos-9-scenario010-standalone-fips-wallaby: *fips_vars_periodic_wallaby - tripleo-ci-centos-9-scenario010-ovn-provider-standalone-fips-wallaby: *fips_vars_periodic_wallaby - tripleo-ci-centos-9-scenario012-standalone-fips-wallaby: *fips_vars_periodic_wallaby - - tripleo-ci-centos-9-standalone-fips-zed: &fips_vars_periodic_zed - vars: *fips_consumer_vars - dependencies: - - tripleo-ci-centos-9-content-provider-zed - - tripleo-ci-centos-9-scenario001-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario002-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario003-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario004-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario007-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario010-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario010-ovn-provider-standalone-fips-zed: *fips_vars_periodic_zed - - tripleo-ci-centos-9-scenario012-standalone-fips-zed: *fips_vars_periodic_zed