From ede7f7c67f5e9d05c77813f0f36a0516b947c8e9 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Tue, 17 May 2022 09:43:20 +0200 Subject: [PATCH] [Stable-Only] Refactoring validations-common stable branch CI pipeliene CI pipeline was refactored to allow for proper testing of the stable/1.6 branch. New jobs were introduced to build and test package against 'train' release of the openstack project. The constraints were updated to respect Openstack train dependencies. Excess lines in the zuul configuration file were replaced with anchors. Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/841762 Depends-On: https://review.opendev.org/c/openstack/tripleo-quickstart-extras/+/842273 Signed-off-by: Jiri Podivin Change-Id: I0fd4485e98235b9da8840d658e29dbcb64036e9b --- .zuul.yaml | 107 ++++++++++++++++++++++++++++++------------ doc/requirements.txt | 8 ++-- test-requirements.txt | 2 +- tox.ini | 4 +- 4 files changed, 85 insertions(+), 36 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 57fef7c..037bb15 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,6 +21,21 @@ - ^doc/.*$ - ^releasenotes/.*$ +- job: + name: validations-common-functional-stable + parent: validations-common-functional + branches: stable/1.6 + override-checkout: stable/train + required-projects: + - name: openstack/requirements + override-checkout: stable/train + - openstack/validations-libs + - openstack/validations-common + - name: openstack/openstacksdk + override-checkout: stable/train + - name: opendev.org/openstack/devstack + override-checkout: stable/train + - job: name: validations-common-reqcheck nodeset: centos-8-stream @@ -28,6 +43,7 @@ run: playbooks/reqcheck.yaml timeout: 1600 voting: true + override-checkout: stable/train required-projects: - openstack/validations-common files: @@ -48,14 +64,47 @@ timeout: 1800 voting: true +- job: + name: validations-common-centos-8-base-stable + nodeset: centos-8-stream + parent: validations-common-centos-8-base + description: | + Base job for validations-common molecule tests, adjusted to work + with stable/1.6 branch of the openstack/validations-common repository and + stable/train branches of other Openstack projects. + This job should not be used for any other purpose. + branches: stable/1.6 + override-checkout: stable/train + vars: + branch_override: stable/train + - job: name: tripleo-ci-centos-8-standalone-validation-common - parent: tripleo-ci-centos-8-standalone + parent: tripleo-ci-base-standalone-centos-8 vars: featureset: '052' validate_services: true enable_validation: true validation_component: validation + build_container_images: true + +- job: + name: tripleo-ci-centos-8-standalone-validation-common-stable + parent: tripleo-ci-centos-8-standalone-validation-common + description: | + Standalone job created and intended solely for the stable/1.6 + branch of the openstack/validations-common project. + Checks out stable/train branches of relevant openstack repos in order + to test mutual compatibility of validations-common-1.6.* and Train release + of Openstack project. This job should not be used for any other purpose. + final: true + branches: stable/1.6 + override-checkout: stable/train + required-projects: + name: openstack/tripleo-ci + override-checkout: master + vars: + branch_override: stable/train - project: templates: @@ -64,18 +113,17 @@ check: jobs: - validations-common-reqcheck - - openstack-tox-linters - - openstack-tox-cover - - openstack-tox-py36 - - openstack-tox-py39 - - validations-common-functional - - tripleo-ci-centos-8-standalone-validation-common: - vars: &consumer_vars - build_container_images: true + - openstack-tox-linters: &tox_override_checkout + override-checkout: stable/train + - openstack-tox-cover: *tox_override_checkout + - openstack-tox-py36: *tox_override_checkout + - openstack-tox-py37: *tox_override_checkout + - validations-common-functional-stable + - tripleo-ci-centos-8-standalone-validation-common-stable: dependencies: - openstack-tox-linters - openstack-tox-cover - - validations-common-functional + - validations-common-functional-stable - openstack-tox-docs: &tripleo-docs files: - ^doc/.* @@ -83,19 +131,19 @@ - ^validations_common/.* gate: jobs: - - openstack-tox-linters - - openstack-tox-py36 - - openstack-tox-py39 - - validations-common-functional - - tripleo-ci-centos-8-standalone-validation-common: - vars: *consumer_vars + - openstack-tox-linters: *tox_override_checkout + - openstack-tox-py36: *tox_override_checkout + - openstack-tox-py37: *tox_override_checkout + - validations-common-functional-stable + - tripleo-ci-centos-8-standalone-validation-common-stable: dependencies: - openstack-tox-linters - - validations-common-functional + - validations-common-functional-stable - openstack-tox-docs: *tripleo-docs promote: jobs: - promote-openstack-tox-docs: *tripleo-docs + - project-template: check: jobs: @@ -120,6 +168,7 @@ - validations-common-centos-8-molecule-check_ram - validations-common-centos-8-molecule-validate_selinux name: validations-common-molecule-jobs + - job: files: - ^validations_common/roles/check_selinux_mode/.* @@ -128,7 +177,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_selinux_mode - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_selinux_mode voting: false @@ -140,7 +189,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-ntp - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: ntp voting: false @@ -152,7 +201,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-service_status - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: service_status voting: false @@ -164,7 +213,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-advanced_format_512e_support - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: advanced_format_512e_support voting: false @@ -176,7 +225,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-dns - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: dns - job: @@ -187,7 +236,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_cpu - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_cpu - job: @@ -198,7 +247,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_ram - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_ram - job: @@ -209,7 +258,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_disk_space - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_disk_space - job: @@ -220,7 +269,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-xfs_check_ftype - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: xfs_check_ftype voting: false @@ -232,7 +281,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_latest_packages_version - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_latest_packages_version - job: @@ -243,7 +292,7 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-validate_selinux - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: validate_selinux - job: @@ -254,6 +303,6 @@ - ^playbooks/molecule/run.yml - ^molecule-requirements.txt name: validations-common-centos-8-molecule-check_rsyslog - parent: validations-common-centos-8-base + parent: validations-common-centos-8-base-stable vars: validations_common_role_name: check_rsyslog diff --git a/doc/requirements.txt b/doc/requirements.txt index d4d963a..9a5e9cc 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,9 +1,9 @@ # this is required for the docs build jobs -sphinx>=2.0.0,!=2.1.0 # BSD License -openstackdocstheme>=2.2.2 # Apache-2.0 -reno>=3.1.0 # Apache-2.0 +sphinx>=1.8.0,!=2.1.0 # BSD License +openstackdocstheme>=1.30.0 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD License -sphinxcontrib-svg2pdfconverter>=1.1.1 # BSD License +sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD License doc8>=0.8.0 # Apache-2.0 bashate>=0.6.0 # Apache-2.0 ruamel.yaml>=0.15.5 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 53b91e5..feba722 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ ansible-core<2.12 # GPLv3+ coverage!=4.4,>=4.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -stestr>=3.0.1 # Apache-2.0 +stestr>=2.5.1 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 054db98..d35fb69 100644 --- a/tox.ini +++ b/tox.ini @@ -122,7 +122,7 @@ commands = commands_pre = ansible-galaxy install -fr {toxinidir}/ansible-collections-requirements.yml deps = - -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -r {toxinidir}/requirements.txt -r {toxinidir}/test-requirements.txt commands = @@ -157,7 +157,7 @@ commands = [testenv:docs] deps = - -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -r {toxinidir}/doc/requirements.txt commands= sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T