openstack
/
tripleo-ci
Code Issues Proposed changes

Adds upgrade jobs to content provider pipelines 

Adds the standalone undercloud and overcloud upgrade jobs
and the overcloud update job for the content provider pipelines
including -ussuri and -train variants where applicable.

Needs depends-on for setting the right provider registry used
during deployment and upgrade.

Depends-On: https://review.opendev.org/753708
Depends-On: https://review.opendev.org/755472
Change-Id: I74265c7a1f63cdf4f1e9ef9e483915408ed7eb44
This commit is contained in:
Marios Andreou 2020-09-22 19:25:06 +03:00 committed by wes hayutin
parent b75d4cf493
commit 25c780d2d9
7 changed files with 105 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toci-quickstart/config/testenv/multinode-rdocloud.yml
View File

@ -50,8 +50,8 @@ docker_registry_host: >-
job.build_container_images|default(false)|bool or
build_container_images|default(false)|bool -%}
127.0.0.1:5001
{%- elif job.registry_ip_address is defined -%}
{{ job.registry_ip_address }}:5001
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}

4
toci-quickstart/config/testenv/multinode-vexxhost.yml
View File

@ -46,8 +46,8 @@ docker_registry_host: >-
job.build_container_images|default(false)|bool or
build_container_images|default(false)|bool -%}
127.0.0.1:5001
{%- elif job.registry_ip_address is defined -%}
{{ job.registry_ip_address }}:5001
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}

4
toci-quickstart/config/testenv/ovb-vexxhost.yml
View File

@ -36,8 +36,8 @@ docker_registry_host: >-
job.build_container_images|default(false)|bool or
build_container_images|default(false)|bool -%}
127.0.0.1:5001
{%- elif job.registry_ip_address is defined -%}
{{ job.registry_ip_address }}:5001
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}

2
zuul.d/base.yaml
View File

@ -288,6 +288,7 @@
Base abstract job for singlenode TripleO CI centos-8 zuulv3 jobs
parent: tripleo-ci-base-centos-8
nodeset: single-centos-8-node
pre-run: playbooks/tripleo-ci/install-built-repo.yml
vars:
undercloud: 127.0.0.2
environment_infra: osinfra
@ -453,6 +454,7 @@
abstract: true
description: |
Base abstract job for standalone upgrade TripleO CI centos-8 zuulv3 jobs
pre-run: playbooks/tripleo-ci/install-built-repo.yml
parent: tripleo-ci-base-centos-8
nodeset: single-centos-8-node
vars:

56
zuul.d/multinode-jobs.yaml
View File

@ -214,12 +214,13 @@
- tripleo-ci-centos-7-standalone-upgrade-train:
irrelevant-files: *standalone_ignored
- project-template:
name: tripleo-multinode-container-minimal-pipeline
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: &multi_consumer_vars
@ -236,12 +237,24 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-standalone:
irrelevant-files: *standalone_ignored
vars: &sa_consumer_vars
@ -268,11 +281,12 @@
- tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
irrelevant-files: *multinode_ignored
gate:
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -290,8 +304,19 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-7-standalone:
irrelevant-files: *standalone_ignored
- tripleo-ci-centos-7-containers-multinode:
@ -308,6 +333,8 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -325,12 +352,24 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-containers-undercloud-minion:
irrelevant-files: *multinode_ignored
@ -397,6 +436,8 @@
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -409,8 +450,19 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-containers-undercloud-minion:
irrelevant-files: *multinode_ignored
- tripleo-ci-centos-8-standalone:

24
zuul.d/standalone-jobs.yaml
View File

@ -487,6 +487,8 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- 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
@ -543,7 +545,16 @@
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-standalone-upgrade:
vars: *consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- 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 job as usual
- tripleo-ci-centos-7-scenario010-standalone:
files: *scen10_files
@ -568,6 +579,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-scenario001-standalone:
files: *scen1_files
vars: *consumer_vars
@ -597,7 +611,13 @@
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
# Keep CentOS 7 jobs as usual
- tripleo-ci-centos-7-scenario001-standalone:
files: *scen1_files

26
zuul.d/undercloud-jobs.yaml
View File

@ -63,6 +63,8 @@
check:
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-undercloud-containers:
irrelevant-files: *undercloud_ignored
vars: &undercloud_consumer_vars
@ -71,6 +73,18 @@
- build
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-undercloud-upgrade:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- 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-7-undercloud-oooq:
irrelevant-files: *undercloud_ignored
- tripleo-ci-centos-7-undercloud-upgrades:
@ -79,14 +93,13 @@
irrelevant-files: *undercloud_ignored
- tripleo-ci-centos-7-containerized-undercloud-upgrades:
irrelevant-files: *undercloud_ignored
- tripleo-ci-centos-8-undercloud-upgrade:
irrelevant-files: *undercloud_ignored
- tripleo-ci-centos-8-undercloud-upgrade-ussuri:
irrelevant-files: *undercloud_ignored
gate:
queue: tripleo
jobs:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-8-undercloud-containers:
irrelevant-files: *undercloud_ignored
vars: *undercloud_consumer_vars
@ -99,8 +112,11 @@
- tripleo-ci-centos-7-containers-undercloud-minion:
irrelevant-files: *undercloud_ignored
- 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
- job:
name: tripleo-ci-centos-7-undercloud-containers