openstack
/
tripleo-ci
Code Issues Proposed changes

Add tripleo-ci-base-standalone-standard parent 

Based on CS job parenting[1], for standalone jobs
following job inheritance used:
* tripleo-ci-base-common-required-projects
* tripleo-ci-base
* tripleo-ci-base-standalone-standard

Content-provider jobs:
* tripleo-ci-base-required-projects-standalone-upstream
** tripleo-ci-content-provider-options
*** tripleo-ci-content-{8,9}-content-provider-{release}

CentOS - 7 Standalone jobs:
* tripleo-ci-base-standalone-standard
** tripleo-ci-base-required-projects-standalone-upstream
*** tripleo-ci-base-standalone-centos-7
*** tripleo-ci-centos-7-standalone
*** tripleo-ci-centos-7-scenarioXXX-standalone
*** tripleo-ci-centos-7-standalone-os-tempest

CentOS - 8 Standalone jobs:
* tripleo-ci-base-standalone-standard
** tripleo-ci-base-required-projects-standalone-upstream
*** tripleo-ci-base-standalone-centos-8
**** tripleo-ci-centos-8-standalone
***** tripleo-ci-centos-8-scenarioXXX-standalone

CentOS - 9 Standalone jobs:
* tripleo-ci-base-required-projects-standalone-upstream
** tripleo-ci-base-standalone-centos-9
*** tripleo-ci-centos-9-standalone
**** tripleo-ci-centos-9-scenarioXXX-standalone

With above pattern:
tripleo-ci-base-standalone-centos-{8,9} will be used
by content-provider CentOS-{8,9} standalone job

[1] https://review.opendev.org/q/topic:cs-parenting

Change-Id: Ia441104b3f57660b670f120553e2449f0db8ced5
Signed-off-by: Amol Kahat <amolkahat@gmail.com>
This commit is contained in:
Amol Kahat 2022-02-25 18:52:20 +05:30
parent 83b81e7b72
commit b9d02061b8
4 changed files with 62 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zuul.d/base-upstream.yaml
View File

@ -77,7 +77,7 @@
- playbooks/tripleo-ci/pre.yaml
run: playbooks/tripleo-ci/run-v3.yaml
post-run: playbooks/tripleo-ci/post.yaml
irrelevant-files:
irrelevant-files: &irrelevant_files
- ^.*\.md$
- ^.*\.rst$
- ^doc/.*$
@ -187,19 +187,7 @@
tags:
- build
- standalone
irrelevant-files: &irrelevant_base_standalone
- ^.*\.md$
- ^.*\.rst$
- ^doc/.*$
- ^etc/.*$
- ^metadata.json$
- ^releasenotes/.*$
# do not put requirements.txt here, as it can have a huge impact
- ^test-requirements.txt$
- ^spec/.*$
- ^Puppetfile.*$
- tox.ini
- ^vars/sova-patterns.yml$
irrelevant-files: *irrelevant_files
- job:
name: tripleo-ci-base-standalone-upgrade-standard
@ -232,7 +220,7 @@
- standalone
extra_tags:
- standalone-upgrade
irrelevant-files: *irrelevant_base_standalone
irrelevant-files: *irrelevant_files
# OVB
- job:

32
zuul.d/base.yaml
View File

@ -318,38 +318,6 @@
roles:
- zuul: opendev.org/openstack/tripleo-ansible
- job:
name: tripleo-ci-base-standalone-centos-8
abstract: true
description: |
Base abstract job for standalone TripleO CI centos-8 zuulv3 jobs
parent: tripleo-ci-base-standalone-required-projects-centos-8
nodeset: single-centos-8-node
pre-run: playbooks/tripleo-ci/install-built-repo.yml
vars:
# for standalone we don't need the multinode network configuration but
# we do want the interface to be created. So let's create br-ex but
# configure it with a different network than what we use for standalone.
# any jobs that need this network configuration for multinode need to
# adjust their configuration to us 172.16.1.0/24
bridge_name: br-ex
bridge_address_prefix: 172.16.1
bridge_address_subnet: 24
bridge_address_offset: 2
bridge_mtu: 1350
undercloud: 127.0.0.2
environment_infra: osinfra
environment_type: standalone
common_featureset: featureset-multinode-common.yml
playbooks:
- quickstart.yml
- multinode-standalone.yml
tags:
- build
- standalone
irrelevant-files: *irrelevant_base_standalone
- job:
name: tripleo-ci-centos-8-scenario010-standalone-base
parent: tripleo-ci-base-standalone-centos-8

9
zuul.d/content-provider.yaml
View File

@ -9,13 +9,13 @@
- job:
name: tripleo-ci-content-provider-options
parent: tripleo-ci-base-standalone-centos-8
parent: tripleo-ci-base-required-projects-standalone-upstream
abstract: true
required-projects:
- opendev.org/openstack/tripleo-common
run:
- playbooks/tripleo-ci/run-v3.yaml
- playbooks/tripleo-ci/run-provider.yml
description: |
Base abstract content provider job
vars:
featureset: '052'
provider_job: true
@ -25,10 +25,13 @@
- quickstart.yml
- multinode-standalone-pre.yml
- job:
name: tripleo-ci-centos-8-content-provider
parent: tripleo-ci-content-provider-options
branches: ^(stable/(train|ussuri|victoria|wallaby)).*$
nodeset: single-centos-8-node
- job:
name: tripleo-ci-centos-9-content-provider

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

@ -3,18 +3,57 @@
# Zuul layout for TripleO standalone jobs.
# It contains all the jobs related to standalone installer testing.
- job:
name: tripleo-ci-base-required-projects-standalone-upstream
description: |
Base abstract job to add required-projects for Upstream Standalone jobs
abstract: true
parent: tripleo-ci-base-standalone-standard
required-projects:
- opendev.org/openstack/tripleo-ansible
- opendev.org/openstack/tripleo-operator-ansible
- name: opendev.org/openstack/ansible-config_template
override-checkout: master
# Centos 7 base job
- job:
name: tripleo-ci-base-standalone-centos-7
abstract: true
description: |
Base abstract job for standalone Tripleo CI Centos-8 zuulv3 jobs.
parent: tripleo-ci-base-required-projects-standalone-upstream
nodeset: single-centos-7-node
# Centos 8 base jobs
- job:
name: tripleo-ci-base-standalone-centos-8
abstract: true
description: |
Base abstract job for standalone TripleO CI Centos-8 zuulv3 jobs.
parent: tripleo-ci-base-required-projects-standalone-upstream
nodeset: single-centos-8-node
# CentOS - 9 base jobs
- job:
name: tripleo-ci-base-standalone-centos-9
abstract: true
description: |
Base abstract job for standalone TripleO CI Centos-9 zuulv3 jobs.
parent: tripleo-ci-base-required-projects-standalone-upstream
nodeset: single-centos-9-node
# ATTENTION: Try to avoid adding irrelevant-files inside templates
# or project because it does override values defined at job level.
# An attempt to optimize at this level can have the exactly opposite effect,
# triggering the affected jobs on far more changes than needed.
- job:
name: tripleo-ci-centos-7-standalone
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
featureset: '052'
irrelevant-files:
irrelevant-files: &irrelevant_files
- .*molecule.*
- ^.*\.md$
- ^.*\.rst$
@ -28,6 +67,7 @@
- ^test-requirements.txt$
- ^vars/sova-patterns.yml$
- tox.ini
- ^scripts/.*
# like parent but with requirements.txt and setup.py removed
- job:
@ -36,47 +76,16 @@
branches: ^(stable/(train|ussuri|victoria|wallaby)).*$
vars:
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
irrelevant-files: *irrelevant_files
- job:
name: tripleo-ci-centos-9-standalone
parent: tripleo-ci-base-standalone-centos-8
parent: tripleo-ci-base-standalone-centos-9
branches: ^(?!stable/(train|ussuri|victoria)).*$
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
irrelevant-files: *irrelevant_files
- job:
name: tripleo-ci-centos-8-standalone-build
@ -450,8 +459,7 @@
- job:
name: tripleo-ci-centos-7-scenario001-standalone
voting: true
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
featureset: '052'
@ -474,8 +482,7 @@
- job:
name: tripleo-ci-centos-7-scenario002-standalone
voting: true
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
featureset: '052'
@ -503,8 +510,7 @@
- job:
name: tripleo-ci-centos-7-scenario003-standalone
voting: true
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
featureset: '052'
@ -523,8 +529,7 @@
- job:
name: tripleo-ci-centos-7-scenario004-standalone
voting: true
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
featureset: '052'
@ -543,8 +548,7 @@
- job:
name: tripleo-ci-centos-7-scenario010-standalone
voting: true
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
tags:
@ -563,8 +567,7 @@
- job:
name: tripleo-ci-centos-7-scenario010-ovn-provider-standalone
voting: false
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^(stable/(stein)).*$
vars:
tags:
@ -621,8 +624,7 @@
- job:
name: tripleo-ci-centos-7-standalone-os-tempest
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
parent: tripleo-ci-base-standalone-centos-7
branches: ^stable/stein$
vars:
featureset: '052'