From 9e70662242d9fbe4a8b369fc7b2a8311b226448a Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Thu, 7 Dec 2017 17:38:48 -0500 Subject: [PATCH] base/multinode rename #1: Add renamed jobs We want to rename the base and multinode integration jobs in order to make sure they are not mistaken by users trying to test their projects. These jobs are not meant to be used outside of integration testing the playbooks and roles found in project-config, zuul-jobs and openstack-zuul-jobs. This is part one of three in renaming the base and multinode integration jobs. We need to: 1) Add new jobs in openstack-zuul-jobs <-- We're here 2) Make project-config use the new job names 3) Remove old jobs Change-Id: I150a0a6dacc7b8862a40f1382ea730957dea0faf --- zuul.d/jobs.yaml | 184 ++++++++++++++++++++++++++++++++++++++++++++ zuul.d/project.yaml | 46 +++++------ 2 files changed, 207 insertions(+), 23 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 42185fca..c0f834cf 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -183,6 +183,190 @@ nodes: - secondary +- job: + name: openstack-infra-base-integration + description: | + Runs roles that are included by default in the 'base' job in order to + prevent regressions. This job should not be used outside the context of + testing roles and playbooks found in project-config, zuul-jobs and + openstack-zuul-jobs. + parent: base-minimal + required-projects: + - openstack-infra/project-config + roles: + - zuul: openstack-infra/zuul-jobs + run: tests/base.yaml + files: + - ^roles/configure-mirror/.* + - ^roles/configure-unbound/.* + - ^roles/emit-job-header/.* + - ^roles/fetch-zuul-cloner/.* + - ^roles/mirror-info/.* + - ^roles/set-zuul-log-path-fact/.* + - ^roles/use-cached-repos/.* + - ^tests/.* + +- job: + name: openstack-infra-base-integration-centos-7 + parent: openstack-infra-base-integration + nodeset: centos-7 + +- job: + name: openstack-infra-base-integration-debian-jessie + parent: openstack-infra-base-integration + nodeset: debian-jessie + +- job: + name: openstack-infra-base-integration-fedora-26 + parent: openstack-infra-base-integration + nodeset: fedora-26 + +- job: + name: openstack-infra-base-integration-opensuse423 + parent: openstack-infra-base-integration + nodeset: opensuse-423 + +- job: + name: openstack-infra-base-integration-ubuntu-trusty + parent: openstack-infra-base-integration + nodeset: ubuntu-trusty + +- job: + name: openstack-infra-base-integration-ubuntu-xenial + parent: openstack-infra-base-integration + nodeset: ubuntu-xenial + +- job: + name: openstack-infra-multinode-integration + description: | + Runs roles that are included by default in the 'multinode' job in order + to prevent regressions. This job should not be used outside the context + of testing roles and playbooks found in project-config, zuul-jobs and + openstack-zuul-jobs. + parent: base-minimal + vars: + ara_generate_html: true + required-projects: + - openstack-infra/project-config + roles: + - zuul: openstack-infra/zuul-jobs + run: tests/multinode.yaml + files: + - ^roles/configure-mirror/.* + - ^roles/configure-unbound/.* + - ^roles/emit-job-header/.* + - ^roles/fetch-zuul-cloner/.* + - ^roles/mirror-info/.* + - ^roles/set-zuul-log-path-fact/.* + - ^roles/use-cached-repos/.* + - ^roles/multi-node-bridge/.* + - ^roles/multi-node-firewall/.* + - ^roles/multi-node-hosts-file/.* + - ^roles/multi-node-known-hosts/.* + - ^tests/.* + +- job: + name: openstack-infra-multinode-integration-centos-7 + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: centos-7 + - name: secondary + label: centos-7 + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + +- job: + name: openstack-infra-multinode-integration-debian-jessie + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: debian-jessie + - name: secondary + label: debian-jessie + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + +- job: + name: openstack-infra-multinode-integration-fedora-26 + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: fedora-26 + - name: secondary + label: fedora-26 + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + +- job: + name: openstack-infra-multinode-integration-opensuse423 + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: opensuse-423 + - name: secondary + label: opensuse-423 + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + +- job: + name: openstack-infra-multinode-integration-ubuntu-trusty + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: ubuntu-trusty + - name: secondary + label: ubuntu-trusty + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + +- job: + name: openstack-infra-multinode-integration-ubuntu-xenial + parent: openstack-infra-multinode-integration + nodeset: + nodes: + - name: primary + label: ubuntu-xenial + - name: secondary + label: ubuntu-xenial + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + - job: name: build-openstack-sphinx-docs parent: tox-docs diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 17f05f81..d4533430 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -3,33 +3,33 @@ name: openstack-infra/openstack-zuul-jobs check: jobs: - - base-integration-centos-7 - - base-integration-debian-jessie - - base-integration-fedora-26: + - openstack-infra-base-integration-centos-7 + - openstack-infra-base-integration-debian-jessie + - openstack-infra-base-integration-fedora-26: voting: false - - base-integration-ubuntu-trusty - - base-integration-ubuntu-xenial - - base-integration-opensuse423 - - multinode-integration-centos-7 - - multinode-integration-debian-jessie - - multinode-integration-fedora-26 - - multinode-integration-ubuntu-trusty - - multinode-integration-ubuntu-xenial - - multinode-integration-opensuse423 + - openstack-infra-base-integration-ubuntu-trusty + - openstack-infra-base-integration-ubuntu-xenial + - openstack-infra-base-integration-opensuse423 + - openstack-infra-multinode-integration-centos-7 + - openstack-infra-multinode-integration-debian-jessie + - openstack-infra-multinode-integration-fedora-26 + - openstack-infra-multinode-integration-ubuntu-trusty + - openstack-infra-multinode-integration-ubuntu-xenial + - openstack-infra-multinode-integration-opensuse423 - build-openstack-sphinx-docs - openstack-zuul-jobs-linters gate: jobs: - - base-integration-centos-7 - - base-integration-debian-jessie - - base-integration-ubuntu-trusty - - base-integration-ubuntu-xenial - - base-integration-opensuse423 - - multinode-integration-centos-7 - - multinode-integration-debian-jessie - - multinode-integration-fedora-26 - - multinode-integration-ubuntu-trusty - - multinode-integration-ubuntu-xenial - - multinode-integration-opensuse423 + - openstack-infra-base-integration-centos-7 + - openstack-infra-base-integration-debian-jessie + - openstack-infra-base-integration-ubuntu-trusty + - openstack-infra-base-integration-ubuntu-xenial + - openstack-infra-base-integration-opensuse423 + - openstack-infra-multinode-integration-centos-7 + - openstack-infra-multinode-integration-debian-jessie + - openstack-infra-multinode-integration-fedora-26 + - openstack-infra-multinode-integration-ubuntu-trusty + - openstack-infra-multinode-integration-ubuntu-xenial + - openstack-infra-multinode-integration-opensuse423 - build-openstack-sphinx-docs - openstack-zuul-jobs-linters