From 9a46bd50bc8b589cf456bb2c18d1acbfb2ccc6e6 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 23 Oct 2020 09:00:22 -0600 Subject: [PATCH] Remove centos7 standalone upgrade jobs Since we switched to HA upgrade testing only, the standalone upgrade jobs are broken on centos7 because of podman vs docker. Since these jobs no longer provide us with valuable upgrade coverage, let's remove them. We still have upgrade testing between versions via the undercloud upgrade process starting with Rocky since it shares the upgrade tasks so we are still exercising the upgrade process in a standalone fashion. We now have centos8 upgrade jobs starting in Train that provide us better coverage going forward. Change-Id: I6c7301e05b0d7ef22b84ee90a7e2d2f9c9356953 Closes-Bug: #1901208 --- zuul.d/layout.yaml | 4 ---- zuul.d/multinode-jobs.yaml | 35 ----------------------------------- zuul.d/periodic.yaml | 6 ------ zuul.d/standalone-jobs.yaml | 6 ------ 4 files changed, 51 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index a8e1208a7..d59a2d416 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -71,8 +71,6 @@ vars: *multi_consumer_vars files: *multi_files_c7 dependencies: *multi_deps_c7 - - tripleo-ci-centos-7-standalone-upgrade-train: - branches: master - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades: files: - ^scripts/emit_releases_file/.*$ @@ -89,5 +87,3 @@ - tripleo-tox-molecule - openstack-tox-py36: files: *py_files - - tripleo-ci-centos-7-standalone-upgrade-train: - branches: master diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index 530b7e9a7..3c0c0e0dd 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -84,13 +84,6 @@ - zuul.d/undercloud-jobs.yaml - tripleo-ci-centos-7-standalone: irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-rocky: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - gate: queue: tripleo @@ -113,10 +106,6 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri: irrelevant-files: *multinode_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - project-template: name: tripleo-multinode-baremetal-full @@ -163,10 +152,6 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-standalone: irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario001-standalone: irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario002-standalone: @@ -209,10 +194,6 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri: irrelevant-files: *multinode_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - project-template: name: tripleo-multinode-container-minimal-pipeline @@ -268,10 +249,6 @@ irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-standalone-rocky: irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-undercloud-containers: irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode: @@ -323,10 +300,6 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates: irrelevant-files: *multinode_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - project-template: name: tripleo-multinode-container-full-pipeline @@ -393,10 +366,6 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-standalone: irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario001-standalone: irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario002-standalone: @@ -477,10 +446,6 @@ irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates: irrelevant-files: *multinode_ignored - - tripleo-ci-centos-7-standalone-upgrade-stein: - irrelevant-files: *standalone_ignored - - tripleo-ci-centos-7-standalone-upgrade-train: - irrelevant-files: *standalone_ignored # NOTE(rfolco): tripleo-multinode-branchful should be used in ci repos only # Check where this template is used across openstack repos with the url below: diff --git a/zuul.d/periodic.yaml b/zuul.d/periodic.yaml index a242683b9..4414c0286 100644 --- a/zuul.d/periodic.yaml +++ b/zuul.d/periodic.yaml @@ -21,12 +21,6 @@ - tripleo-ci-centos-8-scenario010-standalone: vars: force_non_periodic: true - - tripleo-ci-centos-7-standalone-upgrade-stein: - vars: - force_non_periodic: true - - tripleo-ci-centos-7-standalone-upgrade-train: - vars: - force_non_periodic: true - tripleo-ci-centos-8-standalone: vars: force_non_periodic: true diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml index c77021869..b47668e0c 100644 --- a/zuul.d/standalone-jobs.yaml +++ b/zuul.d/standalone-jobs.yaml @@ -437,8 +437,6 @@ - tripleo-ci-centos-7-standalone-rocky - tripleo-ci-centos-8-standalone-upgrade - tripleo-ci-centos-8-standalone-upgrade-ussuri - - tripleo-ci-centos-7-standalone-upgrade-stein - - tripleo-ci-centos-7-standalone-upgrade-train - tripleo-ci-centos-8-standalone - tripleo-ci-centos-8-standalone-build - tripleo-ci-centos-7-standalone @@ -563,8 +561,6 @@ - tripleo-ci-centos-7-scenario010-ovn-provider-standalone: files: *scen10_files - tripleo-ci-centos-7-standalone-rocky - - tripleo-ci-centos-7-standalone-upgrade-stein - - tripleo-ci-centos-7-standalone-upgrade-train - tripleo-ci-centos-7-standalone - tripleo-ci-centos-7-scenario001-standalone: files: *scen1_files @@ -632,8 +628,6 @@ files: *scen3_files - tripleo-ci-centos-7-scenario004-standalone: files: *scen4_files - - tripleo-ci-centos-7-standalone-upgrade-stein - - tripleo-ci-centos-7-standalone-upgrade-train - tripleo-ci-centos-7-standalone - tripleo-ci-centos-7-scenario010-standalone: files: *scen10_files