Add c7 content provider jobs in new template

It will be used for older releases like train and queens.

Moved c7 content provider job to a seperate base to avoid
triggering on master and job freeze issue.

Change-Id: I6f28517bfa4493d2da7f78db124292ac1e18db52
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Signed-off-by: Amol Kahat <amolkahat@gmail.com>
This commit is contained in:
Chandan Kumar (raukadah) 2020-10-28 14:28:55 +05:30
parent 4e8c693d80
commit c7543dc314
2 changed files with 57 additions and 11 deletions

View File

@ -31,11 +31,9 @@
- ^playbooks/tripleo-buildcontainers/.*$
- ^playbooks/tripleo-buildimages/.*$
- ^vars/sova-patterns.yml$
- zuul.d/layout.yaml
- zuul.d/build-containers.yaml
- zuul.d/build-image.yaml
- zuul.d/standalone-jobs.yaml
- zuul.d/undercloud-jobs.yaml
# tripleo-quickstart-extras
- playbooks/quickstart-extras-standalone.yml
- roles/standalone/.*
@ -202,6 +200,7 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: &multi_consumer_vars
@ -247,12 +246,22 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-7-standalone:
irrelevant-files: *standalone_ignored
vars: *sa_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- 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:
irrelevant-files: *multinode_ignored
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates:
irrelevant-files: *multinode_ignored
- tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
@ -264,6 +273,7 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-containers-multinode:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
@ -295,11 +305,21 @@
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-7-standalone:
irrelevant-files: *standalone_ignored
irrelevant-files: *standalone_ignored
vars: *sa_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-containers-multinode:
irrelevant-files: *multinode_ignored
vars: *multi_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- 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
@ -629,7 +649,7 @@
- job:
name: tripleo-ci-centos-7-containers-multinode
parent: tripleo-ci-base-multinode
branches: ^(stable/(rocky|queens)).*$
branches: ^(stable/(queens|train)).*$
vars:
nodes: 1ctlr
featureset: '010'

View File

@ -30,7 +30,6 @@
- zuul.d/build-containers.yaml
- zuul.d/build-image.yaml
- zuul.d/standalone-jobs.yaml
- zuul.d/multinode-jobs.yaml
- tripleo-ci-centos-8-undercloud-containers:
irrelevant-files: *undercloud_ignored
@ -61,6 +60,7 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-undercloud-containers:
irrelevant-files: *undercloud_ignored
vars: &undercloud_consumer_vars
@ -81,8 +81,16 @@
dependencies:
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-undercloud-containers:
- tripleo-ci-centos-7-undercloud-oooq:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-undercloud-containers:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-containerized-undercloud-upgrades:
irrelevant-files: *undercloud_ignored
@ -92,15 +100,27 @@
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-content-provider-ussuri
- tripleo-ci-centos-8-content-provider-train
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-undercloud-containers:
irrelevant-files: *undercloud_ignored
vars: *undercloud_consumer_vars
dependencies:
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-7-undercloud-oooq:
irrelevant-files: *undercloud_ignored
vars: *undercloud_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-undercloud-containers:
irrelevant-files: *undercloud_ignored
vars: *undercloud_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-7-containers-undercloud-minion:
irrelevant-files: *undercloud_ignored
vars: *undercloud_consumer_vars
dependencies:
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-undercloud-upgrade-ussuri:
vars: *undercloud_consumer_vars
irrelevant-files: *undercloud_ignored
@ -173,14 +193,13 @@
- undercloud-upgrade
- job:
name: tripleo-ci-centos-7-content-provider
name: tripleo-ci-centos-7-content-provider-base
parent: tripleo-ci-base-singlenode
run:
- playbooks/tripleo-buildcontainers/docker.yaml
- playbooks/tripleo-ci/run-v3.yaml
- playbooks/tripleo-ci/run-provider.yml
post-run: playbooks/tripleo-buildcontainers/post.yaml
voting: true
vars:
featureset: '027'
provider_job: true
@ -192,9 +211,16 @@
- undercloud
- build
- job:
name: tripleo-ci-centos-7-content-provider
parent: tripleo-ci-centos-7-content-provider-base
branches: ^(stable/(queens|train)).*$
voting: true
- job:
name: tripleo-ci-centos-7-content-provider-queens
parent: tripleo-ci-centos-7-content-provider
parent: tripleo-ci-centos-7-content-provider-base
branches: master
override-checkout: stable/queens
vars:
@ -202,7 +228,7 @@
- job:
name: tripleo-ci-centos-7-content-provider-train
parent: tripleo-ci-centos-7-content-provider
parent: tripleo-ci-centos-7-content-provider-base
branches: master
override-checkout: stable/train
vars: