From 37035d5b9056d2acb599ebe22ebcc7c806a1e232 Mon Sep 17 00:00:00 2001 From: "Gael Chamoulaud (Strider)" Date: Thu, 15 Apr 2021 21:20:51 +0200 Subject: [PATCH] Standardize zuul configurations files This patch makes stable/victoria branch uniform with what we have in master, stable/ussuri and stable/train. Victoria was the only one branch with a zuulv3 structure. Signed-off-by: Gael Chamoulaud (Strider) Change-Id: Ic4c17a131b351b9b2f87d13dfb11042d44d3cee8 --- zuul.d/base.yaml | 15 +++++++++ zuul.d/layout.yaml | 38 +++++++++++++++++++++ .zuul.yaml => zuul.d/molecule.yaml | 53 ------------------------------ 3 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 zuul.d/base.yaml create mode 100644 zuul.d/layout.yaml rename .zuul.yaml => zuul.d/molecule.yaml (88%) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml new file mode 100644 index 000000000..8f6677035 --- /dev/null +++ b/zuul.d/base.yaml @@ -0,0 +1,15 @@ +--- +- job: + description: Base tripleo-validations job + name: tripleo-validations-centos-8-base + nodeset: centos-8 + parent: base + success-url: "reports.html" + failure-url: "reports.html" + pre-run: + - tests/prepare-test-host.yml + - ci/playbooks/pre.yml + run: + - ci/playbooks/run.yml + timeout: 1800 + voting: true diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml new file mode 100644 index 000000000..90ad976e4 --- /dev/null +++ b/zuul.d/layout.yaml @@ -0,0 +1,38 @@ +--- +- project: + templates: + - tripleo-multinode-container-minimal-pipeline + - openstack-python3-victoria-jobs + - tripleo-validations-molecule-jobs + - release-notes-jobs-python3 + check: + jobs: + - openstack-tox-linters: &tripleo-linters + nodeset: centos-8 + - openstack-tox-docs: &tripleo-docs + files: + - ^doc/.* + - ^molecule-requirements.txt + - ^requirements.txt + - ^README.rst + - tripleo-ci-centos-8-content-provider: + dependencies: + - openstack-tox-linters + - tripleo-ci-centos-8-scenario004-standalone: &scenario004 + vars: &vars_scen004 + consumer_job: true + build_container_images: false + dependencies: &deps + - tripleo-ci-centos-8-content-provider + files: + - ^roles/ceph.*$ + gate: + jobs: + - openstack-tox-linters + - openstack-tox-docs: *tripleo-docs + - tripleo-ci-centos-8-content-provider + - tripleo-ci-centos-8-scenario004-standalone: *scenario004 + + promote: + jobs: + - promote-openstack-tox-docs: *tripleo-docs diff --git a/.zuul.yaml b/zuul.d/molecule.yaml similarity index 88% rename from .zuul.yaml rename to zuul.d/molecule.yaml index 4175a976f..0b970beda 100644 --- a/.zuul.yaml +++ b/zuul.d/molecule.yaml @@ -1,57 +1,4 @@ --- -- job: - description: Base tripleo-validations job - name: tripleo-validations-centos-8-base - nodeset: centos-8 - parent: base - success-url: "reports.html" - failure-url: "reports.html" - pre-run: - - tests/prepare-test-host.yml - - ci/playbooks/pre.yml - run: - - ci/playbooks/run.yml - timeout: 1800 - voting: true - -- project: - templates: - - tripleo-multinode-container-minimal-pipeline - - openstack-python3-victoria-jobs - - tripleo-validations-molecule-jobs - - release-notes-jobs-python3 - check: - jobs: - - openstack-tox-linters: &tripleo-linters - nodeset: centos-8 - - openstack-tox-docs: &tripleo-docs - files: - - ^doc/.* - - ^molecule-requirements.txt - - ^requirements.txt - - ^README.rst - - tripleo-ci-centos-8-content-provider: - dependencies: - - openstack-tox-linters - - tripleo-ci-centos-8-scenario004-standalone: &scenario004 - vars: &vars_scen004 - consumer_job: true - build_container_images: false - dependencies: &deps - - tripleo-ci-centos-8-content-provider - files: - - ^roles/ceph.*$ - gate: - jobs: - - openstack-tox-linters - - openstack-tox-docs: *tripleo-docs - - tripleo-ci-centos-8-content-provider - - tripleo-ci-centos-8-scenario004-standalone: *scenario004 - - promote: - jobs: - - promote-openstack-tox-docs: *tripleo-docs - - project-template: check: jobs: