Move Puppet OpenStack gate to Puppet 4 voting
We decided to start voting on Puppet 4 starting from Newton and keep Puppet 3 jobs only for stable branches. This patch removes experimental jobs for puppet4, to move them in the gate, and configure Zuul to run Puppet 3 and 4 jobs only for their respective branches. Note: it also removes the multinode job that we never finished and we don't need it anymore. Change-Id: I00cee8d2356993cb9ad006329afcdc05c2fad9f1
This commit is contained in:
Emilien Macchi
parent
b93a4afbcd
commit
4bfb0099bc
|
|
@ -10473,9 +10473,6 @@
|
|||
job-suffix: ''
|
||||
- puppet-openstack-integration-jobs:
|
||||
job-suffix: '-nv'
|
||||
- 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}':
|
||||
node: ubuntu-trusty-2-node
|
||||
job-suffix: '-nv'
|
||||
|
||||
- project:
|
||||
name: puppet-openstack_spec_helper
|
||||
|
|
|
|||
|
|
@ -178,34 +178,6 @@
|
|||
publishers:
|
||||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}'
|
||||
node: '{node}'
|
||||
|
||||
builders:
|
||||
- print-template-name:
|
||||
template-name: "{template-name}"
|
||||
- link-logs
|
||||
- puppet-openstack-integration-checkout
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
cd puppet-openstack-integration
|
||||
/usr/local/jenkins/slave_scripts/install-distro-packages.sh
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
cd puppet-openstack-integration
|
||||
trap "./copy_logs.sh" EXIT
|
||||
./run_multinode.sh
|
||||
|
||||
wrappers:
|
||||
- build-timeout:
|
||||
timeout: 60
|
||||
- timestamps
|
||||
|
||||
publishers:
|
||||
- devstack-logs
|
||||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: 'gate-puppet-openstack-integration-{puppet_version}-{scenario}-tempest-{node}{job-suffix}'
|
||||
node: '{node}'
|
||||
|
|
|
|||
|
|
@ -891,6 +891,12 @@ project-templates:
|
|||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
|
||||
gate:
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
|
||||
|
|
@ -901,45 +907,25 @@ project-templates:
|
|||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial
|
||||
|
||||
- name: puppet-openstack-integration-jobs-puppet4-check-nv
|
||||
check:
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial-nv
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7-nv
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial-nv
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7-nv
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial-nv
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-centos-7-nv
|
||||
experimental:
|
||||
- gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial-nv
|
||||
- gate-puppet-openstack-integration-4-scenario004-tempest-centos-7-nv
|
||||
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
experimental:
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario004-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
|
||||
|
||||
- name: puppet-openstack-integration-jobs-scenario001
|
||||
check:
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
|
||||
gate:
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
|
||||
experimental:
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario001-tempest-centos-7
|
||||
|
||||
- name: puppet-openstack-integration-jobs-scenario002
|
||||
|
|
@ -947,12 +933,13 @@ project-templates:
|
|||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
|
||||
gate:
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
|
||||
experimental:
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario002-tempest-centos-7
|
||||
|
||||
- name: puppet-openstack-integration-jobs-scenario003
|
||||
|
|
@ -960,12 +947,13 @@ project-templates:
|
|||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
|
||||
gate:
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
|
||||
experimental:
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-trusty
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial
|
||||
- gate-puppet-openstack-integration-4-scenario003-tempest-centos-7
|
||||
|
||||
- name: puppet-openstack-integration-jobs-scenario004
|
||||
|
|
@ -3000,6 +2988,14 @@ jobs:
|
|||
- name: ^gate-puppet-.*-puppet-unit-4.5-.*$
|
||||
branch: ^(?!stable/(liberty|hammer)).*$
|
||||
|
||||
# Liberty, Mitaka, Hammer gates test Puppet 3.
|
||||
- name: ^gate-puppet-openstack-integration-3-.*$
|
||||
branch: ^stable/(liberty|mitaka|hammer).*$
|
||||
|
||||
# Newton and beyond, Jewel gates test Puppet 4.
|
||||
- name: ^gate-puppet-openstack-integration-4-.*$
|
||||
branch: ^(?!stable/(liberty|mitaka|hammer)).*$
|
||||
|
||||
- name: ^gate-tempest-dsvm-lxc
|
||||
branch: ^(?!stable/liberty).*$
|
||||
|
||||
|
|
@ -13530,7 +13526,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13617,7 +13612,6 @@ projects:
|
|||
- name: puppet-check-jobs
|
||||
- name: puppet-module-unit-jobs
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13705,7 +13699,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13720,7 +13713,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13751,7 +13743,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13772,15 +13763,12 @@ projects:
|
|||
- name: merge-check
|
||||
- name: puppet-check-jobs
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-check-nv
|
||||
# run scenario004 job here now, and when ready we'll move it to
|
||||
# puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-scenario004
|
||||
periodic:
|
||||
- propose-puppet-openstack-constraints
|
||||
- propose-puppet-openstack-rdo-promote
|
||||
experimental:
|
||||
- 'gate-puppet-openstack-integration-dsvm-multinode-nv'
|
||||
|
||||
- name: openstack/puppet-openstack_spec_helper
|
||||
template:
|
||||
|
|
@ -13805,7 +13793,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13819,7 +13806,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13938,7 +13924,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
@ -13991,7 +13976,6 @@ projects:
|
|||
- name: puppet-beaker-jobs
|
||||
- name: puppet-beaker-jobs-xenial
|
||||
- name: puppet-openstack-integration-jobs-all
|
||||
- name: puppet-openstack-integration-jobs-puppet4-experimental
|
||||
- name: release-notes-jobs
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
|
|
|
|||
Loading…
Reference in New Issue