Change parenting on C9 jobs to not inherit directly from c8 versions
As seen with the merge of [1] some of the c9 jobs stopped running because the branches: match between c9 and parent c8 were compliments i.e. "^(?!stable/(train|ussuri|victoria|wallaby)).*$" vs "^(stable/(train|ussuri|victoria|wallaby)).*$". To avoid that we remove the direct parenting e.g. centos-9-undercloud-containers no longer inherits from centos-8-undercloud-containers and instead carries the required vars. [1] https://review.opendev.org/c/openstack/tripleo-ci/+/826317 Change-Id: I99ab7f88e0e6edc25be98edf985294a3a8ef3faf
This commit is contained in:
parent
e8c062a241
commit
534d77015a
|
@ -10,8 +10,7 @@
|
|||
- job:
|
||||
name: tripleo-ci-centos-8-content-provider
|
||||
parent: tripleo-ci-base-standalone-centos-8
|
||||
# branches: ^(stable/(train|ussuri|victoria|wallaby)).*$
|
||||
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
|
||||
branches: ^(stable/(train|ussuri|victoria|wallaby)).*$
|
||||
required-projects:
|
||||
- opendev.org/openstack/tripleo-common
|
||||
run:
|
||||
|
@ -28,11 +27,23 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-content-provider
|
||||
parent: tripleo-ci-centos-8-content-provider
|
||||
parent: tripleo-ci-base-standalone-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: single-centos-9-node
|
||||
required-projects:
|
||||
- opendev.org/openstack/tripleo-common
|
||||
run:
|
||||
- playbooks/tripleo-ci/run-v3.yaml
|
||||
- playbooks/tripleo-ci/run-provider.yml
|
||||
vars:
|
||||
containers_base_image: quay.io/centos/centos:stream9
|
||||
featureset: '052'
|
||||
provider_job: true
|
||||
build_container_images: true
|
||||
ib_create_web_repo: true
|
||||
playbooks:
|
||||
- quickstart.yml
|
||||
- multinode-standalone-pre.yml
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-8-content-provider-wallaby
|
||||
|
|
|
@ -221,17 +221,28 @@
|
|||
## CentOS 9 jobs
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-containers-multinode
|
||||
parent: tripleo-ci-centos-8-containers-multinode
|
||||
parent: tripleo-ci-base-multinode-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: two-centos-9-nodes
|
||||
irrelevant-files: *multinode_ignored
|
||||
voting: true
|
||||
vars:
|
||||
nodes: 1ctlr
|
||||
featureset: '010'
|
||||
playbooks:
|
||||
- multinode.yml
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-scenario007-multinode-oooq-container
|
||||
parent: tripleo-ci-centos-8-scenario007-multinode-oooq-container
|
||||
parent: tripleo-ci-base-multinode-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: two-centos-9-nodes
|
||||
irrelevant-files: *multinode_ignored
|
||||
vars:
|
||||
nodes: 1ctlr
|
||||
featureset: '030'
|
||||
playbooks:
|
||||
- multinode.yml
|
||||
|
||||
## CentOS 8 jobs
|
||||
- job:
|
||||
|
|
|
@ -55,11 +55,28 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-standalone
|
||||
parent: tripleo-ci-centos-8-standalone
|
||||
parent: tripleo-ci-base-standalone-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: single-centos-9-node
|
||||
vars:
|
||||
containers_base_image: quay.io/centos/centos:stream9
|
||||
featureset: '052'
|
||||
irrelevant-files:
|
||||
- .*molecule.*
|
||||
- ^.*\.md$
|
||||
- ^.*\.rst$
|
||||
- ^Puppetfile.*$
|
||||
- ^doc/.*$
|
||||
- ^etc/.*$
|
||||
- ^lower-constraints.txt$
|
||||
- ^metadata.json$
|
||||
- ^releasenotes/.*$
|
||||
- ^spec/.*$
|
||||
- ^test-requirements.txt$
|
||||
- ^vars/sova-patterns.yml$
|
||||
- tox.ini
|
||||
- ^scripts/.*
|
||||
# like parent but with requirements.txt and setup.py removed
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-8-standalone-build
|
||||
|
@ -980,9 +997,29 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-standalone-on-multinode-ipa
|
||||
parent: tripleo-ci-centos-8-standalone-on-multinode-ipa
|
||||
parent: tripleo-ci-base-standalone-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: two-centos-9-nodes
|
||||
required-projects:
|
||||
- opendev.org/x/tripleo-ipa
|
||||
roles:
|
||||
- zuul: opendev.org/x/tripleo-ipa
|
||||
vars:
|
||||
featureset: '052'
|
||||
enable_tls: true
|
||||
playbooks:
|
||||
- quickstart.yml
|
||||
- multinode-standalone-ipa.yml
|
||||
- multinode-standalone.yml
|
||||
featureset_override:
|
||||
standalone_environment_files:
|
||||
- environments/ssl/tls-everywhere-endpoints-dns.yaml
|
||||
- environments/services/haproxy-public-tls-certmonger.yaml
|
||||
- environments/ssl/enable-internal-tls.yaml
|
||||
- environments/ssl/enable-memcached-tls.yaml
|
||||
- ci/environments/standalone-ipa.yaml
|
||||
tempest_tempest_conf_overrides:
|
||||
service-clients.http_timeout: '120'
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-8-repoclosure
|
||||
|
|
|
@ -104,10 +104,16 @@
|
|||
|
||||
- job:
|
||||
name: tripleo-ci-centos-9-undercloud-containers
|
||||
parent: tripleo-ci-centos-8-undercloud-containers
|
||||
parent: tripleo-ci-undercloud-content-consumer-centos-8
|
||||
branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
|
||||
nodeset: single-centos-9-node
|
||||
irrelevant-files: *undercloud_ignored
|
||||
vars:
|
||||
featureset: '027'
|
||||
playbooks:
|
||||
- quickstart.yml
|
||||
- multinode-undercloud.yml
|
||||
- multinode-validate.yml
|
||||
|
||||
- job:
|
||||
name: tripleo-ci-centos-7-undercloud-oooq
|
||||
|
|
Loading…
Reference in New Issue