From 8945377001c92b320787710c1caa5d25ddff8636 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 2 Jul 2019 15:47:36 -0700 Subject: [PATCH] Shard project-pipeline config We are about to grow a *lot* of jobs in this repo. To make the project-pipeline config manageable, shard it into a each of the jobs files. This will make it easy to add all the jobs in the file to the project and avoid having a single giant list of jobs. Change-Id: I9677214ead6e5ce62153d64987bb54ebab2856e3 --- zuul-tests.d/container-roles-jobs.yaml | 10 ++++++++++ zuul-tests.d/general-roles-jobs.yaml | 10 ++++++++++ zuul-tests.d/jobs.yaml | 10 ++++++++++ zuul-tests.d/js-roles-jobs.yaml | 10 ++++++++++ zuul-tests.d/project.yaml | 14 ++++---------- zuul-tests.d/puppet-roles-jobs.yaml | 10 ++++++++++ 6 files changed, 54 insertions(+), 10 deletions(-) diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml index 5f8eb0bd1..3ec5865cf 100644 --- a/zuul-tests.d/container-roles-jobs.yaml +++ b/zuul-tests.d/container-roles-jobs.yaml @@ -26,3 +26,13 @@ label: ubuntu-bionic - name: builder label: ubuntu-bionic + +# List all the jobs in this file. + +- project: + check: + jobs: + - zuul-jobs-test-registry + gate: + jobs: + - zuul-jobs-test-registry diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 1fee96a32..f56f75c26 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -8,3 +8,13 @@ files: - ^roles/upload-git-mirror/.* - ^test-playbooks/upload-git-mirror.yaml + +# List all the jobs in this file. + +- project: + check: + jobs: + - zuul-jobs-test-upload-git-mirror + gate: + jobs: + - zuul-jobs-test-upload-git-mirror diff --git a/zuul-tests.d/jobs.yaml b/zuul-tests.d/jobs.yaml index 1ac8047c9..f880e6c1b 100644 --- a/zuul-tests.d/jobs.yaml +++ b/zuul-tests.d/jobs.yaml @@ -11,3 +11,13 @@ vars: tox_environment: ANSIBLE_ROLES_PATH: ~/src/opendev.org/opendev/base-jobs/roles:~/src/opendev.org/zuul/zuul-jobs/roles + +# List all the jobs in this file. + +- project: + check: + jobs: + - zuul-jobs-test-install-nodejs + gate: + jobs: + - zuul-jobs-test-install-nodejs diff --git a/zuul-tests.d/js-roles-jobs.yaml b/zuul-tests.d/js-roles-jobs.yaml index e48c41057..25a49fc1b 100644 --- a/zuul-tests.d/js-roles-jobs.yaml +++ b/zuul-tests.d/js-roles-jobs.yaml @@ -9,3 +9,13 @@ test-playbooks/simple-role-test.yaml vars: role_name: install-nodejs + +# List all the jobs in this file. + +- project: + check: + jobs: + - zuul-jobs-test-install-nodejs + gate: + jobs: + - zuul-jobs-test-install-nodejs diff --git a/zuul-tests.d/project.yaml b/zuul-tests.d/project.yaml index 74cf23c03..d0acb023b 100644 --- a/zuul-tests.d/project.yaml +++ b/zuul-tests.d/project.yaml @@ -1,3 +1,7 @@ +# Note, this file is only part of the project definition; there is a project +# definition in each file in this directory as well which is combined with +# this. + - project: templates: - build-tox-docs @@ -17,11 +21,6 @@ - openstack-infra-multinode-integration-ubuntu-trusty - openstack-infra-multinode-integration-ubuntu-xenial - openstack-infra-multinode-integration-opensuse423 - - zuul-jobs-tox-linters - - zuul-jobs-test-install-nodejs - - zuul-jobs-test-install-pdk-dependencies - - zuul-jobs-test-upload-git-mirror - - zuul-jobs-test-registry - tox-py27 - tox-py35 gate: @@ -40,11 +39,6 @@ - openstack-infra-multinode-integration-ubuntu-trusty - openstack-infra-multinode-integration-ubuntu-xenial - openstack-infra-multinode-integration-opensuse423 - - zuul-jobs-tox-linters - - zuul-jobs-test-install-nodejs - - zuul-jobs-test-install-pdk-dependencies - - zuul-jobs-test-upload-git-mirror - - zuul-jobs-test-registry - tox-py27 - tox-py35 post: diff --git a/zuul-tests.d/puppet-roles-jobs.yaml b/zuul-tests.d/puppet-roles-jobs.yaml index a32f770fa..6c8d28c63 100644 --- a/zuul-tests.d/puppet-roles-jobs.yaml +++ b/zuul-tests.d/puppet-roles-jobs.yaml @@ -9,3 +9,13 @@ test-playbooks/simple-role-test.yaml vars: role_name: install-pdk-dependencies + +# List all the jobs in this file. + +- project: + check: + jobs: + - zuul-jobs-test-install-pdk-dependencies + gate: + jobs: + - zuul-jobs-test-install-pdk-dependencies