Adds layouts for victoria upgrade and update jobs

Definitions are added in the parent patch [1]. This also fixes nit
in the standalone-upgrade jobs layout (forgotten 'old' non consumer
jobs are removed) and re-adds standalone-upgrade-ussuri to the gate
as it is now voting after [2].

[1] https://review.opendev.org/759702
[2] https://review.opendev.org/749487

Change-Id: Iefaf6fdfc3b3febf97fb0f5e2ad2b52f56344777
This commit is contained in:
MSA 2020-10-29 12:18:39 +02:00 committed by wes hayutin
parent 16a24dec6c
commit 1b36059ce9
3 changed files with 78 additions and 12 deletions

View File

@ -198,6 +198,7 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
@ -215,6 +216,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -230,6 +236,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -271,6 +282,7 @@
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
@ -289,6 +301,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -299,6 +316,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -326,6 +348,7 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
@ -343,6 +366,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -358,6 +386,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -428,6 +461,7 @@
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
@ -440,6 +474,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -450,6 +489,11 @@
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars

View File

@ -499,6 +499,7 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario001-standalone:
@ -561,6 +562,11 @@
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-standalone-upgrade-victoria:
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-standalone-upgrade-ussuri:
vars: *consumer_vars
@ -587,9 +593,9 @@
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
# https://bugs.launchpad.net/tripleo/+bug/1895822
# - tripleo-ci-centos-8-content-provider-ussuri
# - tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario001-standalone:
files: *scen1_files
vars: *consumer_vars
@ -624,13 +630,16 @@
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
# https://bugs.launchpad.net/tripleo/+bug/1895822
# - tripleo-ci-centos-8-standalone-upgrade-ussuri:
# vars: *consumer_vars
# irrelevant-files: *sa_upgrade_ignore
# dependencies:
# - tripleo-ci-centos-8-content-provider-ussuri
# - tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-standalone-upgrade-victoria:
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-standalone-upgrade-ussuri:
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
# Keep CentOS 7 jobs as usual
- tripleo-ci-centos-7-scenario001-standalone:
files: *scen1_files

View File

@ -58,6 +58,7 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
@ -74,13 +75,19 @@
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-undercloud-upgrade-ussuri:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-undercloud-upgrade-victoria:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-7-undercloud-oooq:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
@ -98,6 +105,7 @@
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
@ -127,7 +135,12 @@
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-undercloud-upgrade-victoria:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-8-content-provider-victoria
- tripleo-ci-centos-8-content-provider-ussuri
- job:
name: tripleo-ci-centos-7-undercloud-containers
parent: tripleo-ci-base-singlenode