From 4c70263028d7b786e1c2e1c713e607772fdb40cb Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Fri, 13 May 2022 12:12:45 +0200 Subject: [PATCH] [Stable-Only] Refactoring the stable/1.6 CI pipeline Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/841762 Signed-off-by: Jiri Podivin Change-Id: Id621332124817fba0d0e84bde0d8d44fe324f3ec --- .zuul.yaml | 90 ++++++++++++++++++++++++++++++++------------ doc/requirements.txt | 10 ++--- tox.ini | 5 +-- 3 files changed, 73 insertions(+), 32 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index ba95ad0b..cec41dbe 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,13 +4,17 @@ run: playbooks/validations-libs-functional.yaml post-run: playbooks/post.yaml timeout: 7200 + 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: master + override-checkout: stable/train - name: opendev.org/openstack/devstack - override-checkout: master + override-checkout: stable/train vars: devstack_localrc: USE_PYTHON3: true @@ -26,6 +30,7 @@ run: playbooks/reqcheck.yaml timeout: 1600 voting: true + override-checkout: stable/train required-projects: - openstack/validations-libs files: @@ -33,26 +38,71 @@ - job: name: tripleo-ci-centos-8-standalone-validation-libs - 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-libs-stable + parent: tripleo-ci-centos-8-standalone-validation-libs + description: | + Standalone job created and intended solely for the stable/1.6 + branch of the openstack/validations-libs project. + Checks out stable/train branches of relevant openstack repos in order + to test mutual compatibility of validations-libs-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 + + +- job: + name: tripleo-ci-centos-8-undercloud-containers-validations-libs-stable + parent: tripleo-ci-base-undercloud-centos-8 + description: | + Container job created and intended solely for the stable/1.6 + branch of the openstack/validations-libs project. + Checks out stable/train branches of relevant openstack repos in order + to test mutual compatibility of validations-libs-1.6.* and Train release + of Openstack project. This job should not be used for any other purpose. + The job replaces and approximates function of original openstack job, + tripleo-ci-centos-8-undercloud-containers, which is still active in + the master branch of the project. + final: true + branches: stable/1.6 + override-checkout: stable/train + required-projects: + - name: openstack/tripleo-ci + override-checkout: master + vars: + featureset: '027' + playbooks: + - quickstart.yml + - multinode-undercloud.yml + - multinode-validate.yml - project: templates: - check-requirements check: + debug: true jobs: - validations-libs-reqcheck - - openstack-tox-linters - - openstack-tox-cover - - openstack-tox-py36 - - openstack-tox-py39 - - tripleo-ci-centos-8-standalone-validation-libs: &standalone_consumer_job_params - vars: &standalone_consumer_job_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 + - tripleo-ci-centos-8-standalone-validation-libs-stable: &check_deps dependencies: - openstack-tox-linters - openstack-tox-cover @@ -63,27 +113,19 @@ - ^README.rst - ^validations_libs/.* - validations-libs-functional - - tripleo-ci-centos-8-undercloud-containers: &undercloud_containers_job_params - dependencies: - - openstack-tox-linters - - openstack-tox-cover - - validations-libs-functional + - tripleo-ci-centos-8-undercloud-containers-validations-libs-stable: *check_deps gate: jobs: - - openstack-tox-linters - - openstack-tox-py36 - - openstack-tox-py39 + - openstack-tox-linters: *tox_override_checkout + - openstack-tox-py36: *tox_override_checkout + - openstack-tox-py37: *tox_override_checkout - openstack-tox-docs: *tripleo-docs - validations-libs-functional - - tripleo-ci-centos-8-standalone-validation-libs: - vars: *standalone_consumer_job_vars - dependencies: - - openstack-tox-linters - - validations-libs-functional - - tripleo-ci-centos-8-undercloud-containers: + - tripleo-ci-centos-8-standalone-validation-libs-stable: &gate_deps dependencies: - openstack-tox-linters - validations-libs-functional + - tripleo-ci-centos-8-undercloud-containers-validations-libs-stable: *gate_deps promote: jobs: - promote-openstack-tox-docs: *tripleo-docs diff --git a/doc/requirements.txt b/doc/requirements.txt index 865bdf63..f1c77c60 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,8 +1,8 @@ # this is required for the docs build jobs -sphinx>=2.0.0,!=2.1.0 # BSD -openstackdocstheme>=2.2.2 # Apache-2.0 +sphinx>=1.8.0,!=2.1.0 # BSD +openstackdocstheme>=1.30.0 # Apache-2.0 doc8>=0.8.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD -sphinxcontrib-svg2pdfconverter>=1.1.1 # BSD License -reno>=3.1.0 # Apache-2.0 -cliff>=3.2.0 # Apache-2.0 +sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD License +reno>=2.5.0 # Apache-2.0 +cliff>=2.16.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 1f788372..cc24bce2 100644 --- a/tox.ini +++ b/tox.ini @@ -25,10 +25,9 @@ setenv = commands = stestr run --slowest --color {posargs} deps = - -c {env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -r {toxinidir}/requirements.txt -r {toxinidir}/test-requirements.txt - -r {toxinidir}/doc/requirements.txt whitelist_externals = bash [testenv:bindep] @@ -91,7 +90,7 @@ commands = [testenv:docs] deps = - -c {env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -r {toxinidir}/test-requirements.txt -r {toxinidir}/doc/requirements.txt commands=