openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Remove all rocky related jobs/conditionals tests after rocky End of Life"

This commit is contained in:
Zuul 2021-04-07 02:55:43 +00:00 committed by Gerrit Code Review
parent 8218fe3bfe b813597a5a
commit 21fe9c416d
15 changed files with 70 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/build-containers/defaults/main.yaml
View File

@ -23,7 +23,7 @@ component_ci_containers: ""
openstack_git_root: "{{ ansible_user_dir }}/src/opendev.org/openstack"
# container prefix is generally centos for usptream and rhel for downstream
container_name_prefix: >-
{% if osp_branch is not defined and ci_branch in ['queens','rocky','stein','train','ussuri'] -%}
{% if osp_branch is not defined and ci_branch in ['queens','stein','train','ussuri'] -%}
{{ ansible_distribution|lower }}-binary
{%- else -%}
openstack

4
roles/build-containers/templates/kolla-build.sh.j2
View File

@ -10,7 +10,7 @@ TRIPLEO_CI_PATH="{{ ansible_user_dir }}/src/opendev.org/openstack/tripleo-ci"
### build
openstack overcloud container image build {{ container_config }}\
{% if ci_branch not in ['queens', 'rocky'] and ci_branch in exclude_containers %}
{% if ci_branch not in ['queens'] and ci_branch in exclude_containers %}
{% for item in exclude_containers[ci_branch] %}
--exclude {{ item }} \
{% endfor %}
@ -18,7 +18,7 @@ openstack overcloud container image build {{ container_config }}\
{% if use_buildah is defined and use_buildah %}
--use-buildah \
{% endif %}
{% if ci_branch not in ['queens', 'rocky', 'stein'] %}
{% if ci_branch not in ['queens', 'stein'] %}
--work-dir {{ ansible_user_dir }}/container-builds \
{% endif %}
{% if build_timeout is defined %}

4
roles/build-containers/vars/main.yaml
View File

@ -45,10 +45,6 @@ exclude_containers:
stein:
- opendaylight
- neutron-server-opendaylight
rocky:
- grafana
- opendaylight
- neutron-server-opendaylight
queens:
- opendaylight
- neutron-server-opendaylight

6
roles/run-test/templates/oooq_common_functions.sh.j2
View File

@ -30,12 +30,6 @@ function previous_release_mixed_upgrade_case {
train|promotion-testing-hash-train)
echo "stein"
;;
stein|promotion-testing-hash-stein)
echo "rocky"
;;
rocky|promotion-testing-hash-rocky)
echo "queens"
;;
queens)
echo "pike"
;;

6
scripts/emit_releases_file/emit_releases_file.py
View File

@ -44,7 +44,6 @@ RELEASES = [
'ocata',
'pike',
'queens',
'rocky',
'stein',
'train',
'ussuri',
@ -53,7 +52,7 @@ RELEASES = [
]
# Define long term releases
LONG_TERM_SUPPORT_RELEASES = ['queens']
UNSUPPORTED_STANDALONE = ['newton', 'ocata', 'pike', 'queens', 'rocky']
UNSUPPORTED_STANDALONE = ['newton', 'ocata', 'pike', 'queens']
# NAMED DLRN HASHES
NEWTON_HASH_NAME = 'current-passed-ci'
@ -182,9 +181,6 @@ def compose_releases_dictionary(
stable_release
* Overcloud FFWDUpgrade: as above, except deploy is set to
tripleo-ci-testing of 3 previous releases from stable_release
rocky).
* Overcloud Update: stable_release is equal to target, but going from
previous-current-tripleo to current hashes.
:param distro_name: Distro name
:param distro_version: Distro version
"""

8
scripts/emit_releases_file/test_release_file.py
View File

@ -72,7 +72,7 @@ def test_converting_from_periodic_uc_upgrade_has_single_release_with_sufix():
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'master',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_release': 'stein',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'master',
'standalone_target_hash': 'current-tripleo',
@ -86,7 +86,7 @@ def test_converting_from_periodic_uc_upgrade_has_single_release_with_sufix():
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'promotion-testing-hash-master',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'promotion-testing-hash-rocky',
'standalone_deploy_release': 'promotion-testing-hash-stein',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'promotion-testing-hash-master',
'standalone_target_hash': 'current-tripleo',
@ -134,7 +134,7 @@ def test_converting_from_periodic_noop_has_single_release_with_sufix():
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'master',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_release': 'stein',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'master',
'standalone_target_hash': 'current-tripleo',
@ -148,7 +148,7 @@ def test_converting_from_periodic_noop_has_single_release_with_sufix():
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'promotion-testing-hash-master',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'promotion-testing-hash-rocky',
'standalone_deploy_release': 'promotion-testing-hash-stein',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'promotion-testing-hash-master',
'standalone_target_hash': 'current-tripleo',

248
scripts/emit_releases_file/test_release_name.py
View File

@ -109,44 +109,6 @@ def hash_mock_setup():
'standalone_target_hash': 'current-tripleo',
},
),
(
'stein',
{
'undercloud_install_release': 'stein',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'stein',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'stein',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'stein',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'stein',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'queens',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
],
)
def test_overcloud_upgrade_is_n_minus_one_to_n(
@ -256,44 +218,6 @@ def test_overcloud_upgrade_is_n_minus_one_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'stein',
{
'undercloud_install_release': 'stein',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'stein',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'stein',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'stein',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'stein',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'queens',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
],
)
def test_period_overcloud_upgrade_is_n_minus_one_to_n(
@ -516,44 +440,6 @@ def test_period_ffu_overcloud_upgrade_is_n_minus_three_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'stein',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'stein',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'stein',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'stein',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'stein',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'stein',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
(
'rocky',
{
'undercloud_install_release': 'queens',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
],
)
def test_undercloud_upgrade_is_n_minus_one_to_n(
@ -603,6 +489,25 @@ def test_undercloud_upgrade_is_n_minus_one_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'victoria',
{
'undercloud_install_release': 'ussuri',
'undercloud_install_hash': 'previous-current-tripleo',
'undercloud_target_release': 'victoria',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'victoria',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'victoria',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'victoria',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_target_release': 'victoria',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
],
)
def test_period_undercloud_upgrade_is_n_minus_one_to_n(
@ -656,25 +561,6 @@ def test_period_undercloud_upgrade_is_n_minus_one_to_n(
'standalone_target_hash': 'current-tripleo',
},
),
(
'stein',
{
'undercloud_install_release': 'stein',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'stein',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'stein',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'stein',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_deploy_newest_hash': 'old-current',
'standalone_deploy_hash': 'previous-current-tripleo',
'standalone_target_release': 'stein',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
},
),
],
)
def test_standalone_upgrade_is_n_minus_one_to_n(
@ -875,25 +761,6 @@ def test_period_standalone_upgrade_is_n_minus_one_to_n(
'standalone_target_release': 'stein',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
'standalone_target_release': 'rocky',
},
),
],
)
def test_overcloud_update_target_is_hash(
@ -1002,44 +869,6 @@ def test_overcloud_update_target_is_hash(
'standalone_target_release': 'train',
},
),
(
'stein',
{
'undercloud_install_release': 'stein',
'undercloud_install_hash': 'tripleo-ci-testing',
'undercloud_target_release': 'stein',
'undercloud_target_hash': 'tripleo-ci-testing',
'overcloud_deploy_release': 'stein',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'stein',
'overcloud_target_hash': 'tripleo-ci-testing',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'tripleo-ci-testing',
'standalone_deploy_release': 'stein',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'tripleo-ci-testing',
'standalone_target_release': 'stein',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'tripleo-ci-testing',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'tripleo-ci-testing',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'previous-current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'tripleo-ci-testing',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'tripleo-ci-testing',
'standalone_deploy_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'tripleo-ci-testing',
'standalone_target_release': 'rocky',
},
),
],
)
def test_period_overcloud_update_target_is_hash(
@ -1168,26 +997,6 @@ def test_period_overcloud_update_target_is_hash(
'standalone_target_release': 'stein',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'current-tripleo',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'current-tripleo',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'current-tripleo',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'current-tripleo',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'current-tripleo',
'standalone_deploy_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'current-tripleo',
'standalone_target_release': 'rocky',
},
),
],
)
def test_noop_target_is_the_same(
@ -1308,25 +1117,6 @@ def test_noop_target_is_the_same(
'standalone_target_release': 'stein',
},
),
(
'rocky',
{
'undercloud_install_release': 'rocky',
'undercloud_install_hash': 'tripleo-ci-testing',
'undercloud_target_release': 'rocky',
'undercloud_target_hash': 'tripleo-ci-testing',
'overcloud_deploy_release': 'rocky',
'overcloud_deploy_hash': 'tripleo-ci-testing',
'overcloud_target_release': 'rocky',
'overcloud_target_hash': 'tripleo-ci-testing',
'standalone_deploy_newest_hash': 'current',
'standalone_deploy_hash': 'tripleo-ci-testing',
'standalone_deploy_release': 'rocky',
'standalone_target_newest_hash': 'current',
'standalone_target_hash': 'tripleo-ci-testing',
'standalone_target_release': 'rocky',
},
),
],
)
def test_periodic_noop_target_is_the_same(

6
scripts/emit_releases_file/test_unsupported_upgrades.py
View File

@ -48,7 +48,7 @@ def test_overcloud_upgrades_has_to_be_mixed(upgrade_type):
@pytest.mark.parametrize(
'stable_release', ['ocata', 'pike', 'newton', 'rocky', 'stein', 'master']
'stable_release', ['ocata', 'pike', 'newton', 'stein', 'master']
)
def test_ffu_overcloud_upgrade_only_supported_from_newton(stable_release):
featureset = {
@ -60,9 +60,7 @@ def test_ffu_overcloud_upgrade_only_supported_from_newton(stable_release):
compose_releases_dictionary(stable_release, featureset, upgrade_from)
@pytest.mark.parametrize(
'stable_release', ['newton', 'ocata', 'pike', 'queens', 'rocky']
)
@pytest.mark.parametrize('stable_release', ['newton', 'ocata', 'pike', 'queens'])
def test_standalone_upgrade_only_supported_from_stein(stable_release):
featureset = {
'standalone_upgrade': True,

3
scripts/oooq_common_functions.sh
View File

@ -33,9 +33,6 @@ function previous_release_mixed_upgrade_case {
stein|promotion-testing-hash-stein)
echo "rocky"
;;
rocky|promotion-testing-hash-rocky)
echo "queens"
;;
queens)
echo "pike"
;;

23
zuul.d/build-containers.yaml
View File

@ -52,16 +52,6 @@
jobs:
- tripleo-build-containers-centos-7-buildah-stein
- project-template:
name: tripleo-build-containers-jobs-rocky
check:
jobs:
- tripleo-build-containers-centos-7-rocky
gate:
queue: tripleo
jobs:
- tripleo-build-containers-centos-7-rocky
- job:
name: tripleo-build-containers-centos-7-base
parent: tripleo-build-containers-base-with-files
@ -73,7 +63,7 @@
name: tripleo-build-containers-centos-7
parent: tripleo-build-containers-base-with-files
nodeset: single-centos-7-node
branches: ^(stable/(rocky|stein|train)).*$
branches: ^(stable/(stein|train)).*$
voting: true
- job:
@ -90,13 +80,6 @@
vars:
branch_override: stable/stein
- job:
name: tripleo-build-containers-centos-7-rocky
parent: tripleo-build-containers-centos-7-base
override-checkout: stable/rocky
vars:
branch_override: stable/rocky
- job:
name: tripleo-build-containers-centos-7-buildah
description: |
@ -125,7 +108,7 @@
name: tripleo-build-containers-centos-8
parent: tripleo-build-containers-base-with-files
nodeset: single-centos-8-node
branches: ^(?!stable/(pike|queens|rocky|stein)).*$
branches: ^(?!stable/(pike|queens|stein)).*$
voting: true
required-projects:
- opendev.org/openstack/ansible-role-container-registry
@ -196,5 +179,5 @@
- job:
name: tripleo-build-containers-ubi-8
parent: tripleo-build-containers-ubi-8-base
branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri)).*$
branches: ^(?!stable/(pike|queens|stein|train|ussuri)).*$
voting: true

12
zuul.d/build-image.yaml
View File

@ -128,7 +128,7 @@
- job:
name: tripleo-buildimage-ironic-python-agent-centos-8
parent: tripleo-build-images-base-centos-8
branches: ^(?!stable/(queens|rocky|stein)).*$
branches: ^(?!stable/(queens|stein)).*$
vars:
tripleo_image_type: ironic-python-agent
irrelevant-files:
@ -138,7 +138,7 @@
- job:
name: tripleo-buildimage-overcloud-full-centos-8
parent: tripleo-build-images-base-centos-8
branches: ^(?!stable/(queens|rocky|stein)).*$
branches: ^(?!stable/(queens|stein)).*$
vars:
tripleo_image_type: overcloud-full
irrelevant-files:
@ -148,7 +148,7 @@
- job:
name: tripleo-buildimage-overcloud-hardened-full-centos-8
parent: tripleo-build-images-base-centos-8
branches: ^(?!stable/(queens|rocky|stein)).*$
branches: ^(?!stable/(queens|stein)).*$
vars:
tripleo_image_type: overcloud-hardened-full
irrelevant-files:
@ -261,7 +261,7 @@
- job:
name: tripleo-buildimage-ironic-python-agent-centos-7
parent: tripleo-build-images-base
branches: ^(stable/(pike|queens|rocky|stein|train)).*$
branches: ^(stable/(pike|queens|stein|train)).*$
vars:
tripleo_image_type: ironic-python-agent
tripleo_image_os: centos7
@ -272,7 +272,7 @@
- job:
name: tripleo-buildimage-overcloud-full-centos-7
parent: tripleo-build-images-base
branches: ^(stable/(pike|queens|rocky|stein|train)).*$
branches: ^(stable/(pike|queens|stein|train)).*$
vars:
tripleo_image_type: overcloud-full
tripleo_image_os: centos7
@ -283,7 +283,7 @@
- job:
name: tripleo-buildimage-overcloud-hardened-full-centos-7
parent: tripleo-build-images-base
branches: ^(stable/(pike|queens|rocky|stein|train)).*$
branches: ^(stable/(pike|queens|stein|train)).*$
vars:
tripleo_image_type: overcloud-hardened-full
tripleo_image_os: centos7

20
zuul.d/deprecated-jobs.yaml
View File

@ -143,7 +143,7 @@
voting: false
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein|train)).*$
vars:
featureset: '060'
standalone_ceph: true
@ -152,7 +152,7 @@
name: tripleo-ci-centos-7-scenario009-multinode-oooq-container
parent: tripleo-ci-base-multinode
voting: false
branches: ^(stable/(queens|rocky|stein|train)).*$
branches: ^(stable/(queens|stein|train)).*$
vars:
nodes: 1ctlr
featureset: '033'
@ -642,7 +642,6 @@
- ci/environments/scenario007-standalone.yaml
# puppet-tripleo
- ^manifests/haproxy.*$
- tripleo-ci-centos-7-standalone-rocky
- tripleo-ci-centos-8-standalone-upgrade-ussuri
- tripleo-ci-centos-8-standalone
- tripleo-ci-centos-8-standalone-build
@ -772,3 +771,18 @@
irrelevant-files: *undercloud_ignored
- tripleo-ci-centos-8-undercloud-upgrade-ussuri:
irrelevant-files: *undercloud_ignored
# Deprecated Rocky jobs
# http://lists.openstack.org/pipermail/openstack-discuss/2021-March/020912.html
- job:
name: tripleo-ci-centos-7-undercloud-containers
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
branches: ^(stable/rocky).*$
vars:
featureset: '027'
playbooks:
- quickstart.yml
- multinode-undercloud.yml
- multinode-validate.yml

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

@ -195,14 +195,12 @@
jobs:
- tripleo-ci-centos-7-containers-multinode-stein:
irrelevant-files: *multinode_ignored
- tripleo-ci-centos-7-containers-multinode-rocky:
irrelevant-files: *multinode_ignored
## CentOS 8 jobs
- job:
name: tripleo-ci-centos-8-containers-multinode
parent: tripleo-ci-base-multinode-centos-8
branches: ^(?!stable/(queens|rocky|stein)).*$
branches: ^(?!stable/(queens|stein)).*$
voting: true
vars:
nodes: 1ctlr
@ -213,7 +211,7 @@
- job:
name: tripleo-ci-centos-8-containers-undercloud-minion
parent: tripleo-ci-base-multinode-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
nodes: 1minion
featureset: '061'
@ -272,24 +270,10 @@
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-7-containers-multinode-rocky
parent: tripleo-ci-base-multinode
timeout: 10800
voting: true
branches: master
override-checkout: 'stable/rocky'
vars:
branch_override: 'stable/rocky'
nodes: 1ctlr
featureset: '010'
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-8-scenario007-multinode-oooq-container
parent: tripleo-ci-base-multinode-centos-8
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
branches: ^(?!stable/(queens|stein|train|ussuri)).*$
vars:
nodes: 1ctlr
featureset: '030'

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

@ -33,7 +33,7 @@
- job:
name: tripleo-ci-centos-8-standalone
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
featureset: '052'
irrelevant-files:
@ -66,32 +66,6 @@
- roles/container-update/.*
- roles/extras-common/.*
# This job is rocky only!
# os_tempest needs updates rocky, that's WIP
- job:
name: tripleo-ci-centos-7-standalone-rocky
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
branches: stable/rocky
vars:
featureset: '052'
featureset_override:
tempest_format: container
use_os_tempest: false
irrelevant-files:
- .*molecule.*
- ^.*\.md$
- ^.*\.rst$
- ^Puppetfile.*$
- ^doc/.*$
- ^etc/.*$
- ^metadata.json$
- ^releasenotes/.*$
- ^spec/.*$
- ^test-requirements.txt$
- ^vars/sova-patterns.yml$
- tox.ini
- project-template:
name: tripleo-standalone-scenarios-pipeline
check:
@ -315,7 +289,6 @@
files: *scen10_files
- tripleo-ci-centos-7-scenario010-ovn-provider-standalone:
files: *scen10_files
- tripleo-ci-centos-7-standalone-rocky
- tripleo-ci-centos-7-standalone
- tripleo-ci-centos-7-scenario001-standalone:
files: *scen1_files
@ -530,7 +503,7 @@
name: tripleo-ci-centos-8-scenario012-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
featureset: '060'
standalone_ceph: true
@ -562,7 +535,7 @@
name: tripleo-ci-centos-8-scenario001-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
- job:
name: tripleo-ci-centos-8-scenario001-standalone-options
@ -593,7 +566,7 @@
name: tripleo-ci-centos-8-scenario002-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
- job:
name: tripleo-ci-centos-8-scenario002-standalone-options
@ -628,7 +601,7 @@
name: tripleo-ci-centos-8-scenario003-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
- job:
name: tripleo-ci-centos-8-scenario003-standalone-options
@ -656,7 +629,7 @@
name: tripleo-ci-centos-8-scenario004-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
- job:
name: tripleo-ci-centos-8-scenario004-standalone-options
@ -689,7 +662,7 @@
name: tripleo-ci-centos-8-scenario007-standalone
voting: true
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
featureset: '052'
featureset_override:
@ -708,7 +681,7 @@
name: tripleo-ci-centos-8-scenario010-standalone
voting: false
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
tags:
- build
@ -729,7 +702,7 @@
name: tripleo-ci-centos-8-scenario010-ovn-provider-standalone
voting: false
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
vars:
tags:
- build
@ -805,7 +778,7 @@
parent: tripleo-ci-base-standalone-centos-8
voting: false
nodeset: two-centos-8-nodes
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein|train)).*$
required-projects:
- opendev.org/x/tripleo-ipa
roles:
@ -829,7 +802,7 @@
- job:
name: tripleo-ci-centos-8-content-provider
parent: tripleo-ci-base-standalone-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
run:
- playbooks/tripleo-ci/run-v3.yaml
- playbooks/tripleo-ci/run-provider.yml

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

@ -82,22 +82,10 @@
dependencies:
- tripleo-ci-centos-7-content-provider
- job:
name: tripleo-ci-centos-7-undercloud-containers
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
branches: ^(stable/rocky).*$
vars:
featureset: '027'
playbooks:
- quickstart.yml
- multinode-undercloud.yml
- multinode-validate.yml
- job:
name: tripleo-ci-centos-8-undercloud-containers
parent: tripleo-ci-undercloud-content-consumer-centos-8
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$
voting: true
vars:
featureset: '027'