openstack/openstack-helm
Code Issues Proposed changes

Prepare migration of base jobs to OSH-infra

Browse Source 
Without this patch, openstack-helm-functional and
openstack-helm-multinode are a repetition of the
openstack-helm-infra-functional and openstack-helm-infra-multinode
jobs.

This is a problem, as multiple patches are required to change a base
job, and can lead to inconsistencies.

Instead the abstract jobs should be defined in only one place, the
openstack-helm-infra repositories. This will therefore be the location
of the openstack-helm project lint, functional, and multinode "base"
jobs.

From that point, openstack-helm-infra and openstack-helm can implement
their own job variants should this be required.

This patch fixes the link dependency between the two repositories by
ensuring all the OSH jobs are using their own local job definition
("-temp" jobs) during the migration.

Change-Id: I3d3193415ba65d58c5dd9bbb1fc515f5399edece
Depends-On: https://review.openstack.org/610482
Depends-On: https://review.openstack.org/610488
Depends-On: https://review.openstack.org/611239
This commit is contained in:
Jean-Philippe Evrard 2018-10-15 13:23:43 +02:00 committed by Chris Wedgwood
parent 6a9c12c910
commit e46d98bf05
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zuul.d/jobs-openstack-helm.yaml
View File

@ -18,7 +18,7 @@
# These will move with their playbooks inside the # These will move with their playbooks inside the
# openstack-helm-infra repository # openstack-helm-infra repository
- job: - job:
name: openstack-helm-functional name: openstack-helm-functional-temp
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -26,7 +26,7 @@
- job: - job:
name: openstack-helm-dev-deploy name: openstack-helm-dev-deploy
parent: openstack-helm-functional parent: openstack-helm-functional-temp
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
timeout: 7200 timeout: 7200
@ -91,8 +91,8 @@
run: tools/gate/playbooks/dev-deploy-nfs.yaml run: tools/gate/playbooks/dev-deploy-nfs.yaml
- job: - job:
name: openstack-helm-multinode name: openstack-helm-multinode-temp
parent: openstack-helm-functional parent: openstack-helm-functional-temp
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
vars: vars:
@ -112,7 +112,7 @@
- job: - job:
timeout: 9600 timeout: 9600
name: openstack-helm-armada-fullstack-deploy name: openstack-helm-armada-fullstack-deploy
parent: openstack-helm-functional parent: openstack-helm-functional-temp
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
vars: vars:
@ -132,23 +132,23 @@
nodeset: openstack-helm-five-node-ubuntu nodeset: openstack-helm-five-node-ubuntu
- job: - job:
name: openstack-helm-multinode-ubuntu name: openstack-helm-multinode-temp-ubuntu
parent: openstack-helm-multinode parent: openstack-helm-multinode-temp
nodeset: openstack-helm-five-node-ubuntu nodeset: openstack-helm-five-node-ubuntu
- job: - job:
name: openstack-helm-multinode-centos name: openstack-helm-multinode-temp-centos
parent: openstack-helm-multinode parent: openstack-helm-multinode-temp
nodeset: openstack-helm-five-node-centos nodeset: openstack-helm-five-node-centos
- job: - job:
name: openstack-helm-multinode-fedora name: openstack-helm-multinode-temp-fedora
parent: openstack-helm-multinode parent: openstack-helm-multinode-temp
nodeset: openstack-helm-five-node-fedora nodeset: openstack-helm-five-node-fedora
- job: - job:
name: openstack-helm-ironic-ubuntu name: openstack-helm-ironic-ubuntu
parent: openstack-helm-multinode parent: openstack-helm-multinode-temp
nodeset: openstack-helm-ubuntu nodeset: openstack-helm-ubuntu
run: tools/gate/playbooks/ironic-deploy.yaml run: tools/gate/playbooks/ironic-deploy.yaml
@ -193,7 +193,7 @@
- job: - job:
timeout: 10800 timeout: 10800
name: openstack-helm-multinode-tempest name: openstack-helm-multinode-temp-tempest
parent: openstack-helm-multinode parent: openstack-helm-multinode-temp
nodeset: openstack-helm-five-node-ubuntu nodeset: openstack-helm-five-node-ubuntu
run: tools/gate/playbooks/multinode-tempest-deploy.yaml run: tools/gate/playbooks/multinode-tempest-deploy.yaml

8
zuul.d/project.yaml
View File

@ -34,7 +34,7 @@
voting: false voting: false
- openstack-helm-dev-deploy-nfs-ldap: - openstack-helm-dev-deploy-nfs-ldap:
voting: false voting: false
- openstack-helm-multinode-ubuntu: - openstack-helm-multinode-temp-ubuntu:
voting: false voting: false
- openstack-helm-ironic-ubuntu: - openstack-helm-ironic-ubuntu:
voting: false voting: false
@ -59,7 +59,7 @@
- openstack-helm-kolla-deploy-ceph-ovs - openstack-helm-kolla-deploy-ceph-ovs
experimental: experimental:
jobs: jobs:
- openstack-helm-multinode-centos - openstack-helm-multinode-temp-centos
# NOTE(lamt): Make fedora job experimental until issues with gates are resolved. # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
- openstack-helm-multinode-fedora - openstack-helm-multinode-temp-fedora
- openstack-helm-multinode-tempest - openstack-helm-multinode-temp-tempest