Merge "Revert "puppet: xenial jobs are now -nv""

This commit is contained in:
Jenkins 2016-07-11 16:12:36 +00:00 committed by Gerrit Code Review
commit cf0100ad0d

View File

@ -813,9 +813,9 @@ project-templates:
- gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
- gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial-nv
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial-nv
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial-nv
- 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:
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-trusty
- gate-puppet-openstack-integration-3-scenario001-tempest-centos-7
@ -823,6 +823,9 @@ project-templates:
- gate-puppet-openstack-integration-3-scenario002-tempest-centos-7
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
- gate-puppet-openstack-integration-3-scenario003-tempest-centos-7
- 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
experimental:
- gate-puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial
- gate-puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial
@ -857,10 +860,11 @@ project-templates:
- 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-nv
- gate-puppet-openstack-integration-3-scenario001-tempest-ubuntu-xenial
- gate-puppet-openstack-integration-3-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
@ -869,10 +873,11 @@ project-templates:
- name: puppet-openstack-integration-jobs-scenario002
check:
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-trusty
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial-nv
- gate-puppet-openstack-integration-3-scenario002-tempest-ubuntu-xenial
- gate-puppet-openstack-integration-3-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
@ -881,10 +886,11 @@ project-templates:
- name: puppet-openstack-integration-jobs-scenario003
check:
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-trusty
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial-nv
- gate-puppet-openstack-integration-3-scenario003-tempest-ubuntu-xenial
- gate-puppet-openstack-integration-3-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