From 4c64649b9af7302fcb032b75e8c0f990a42ec13f Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Thu, 23 May 2013 17:13:07 -0700 Subject: [PATCH] remove pupet 2.6.x support We are no longer supported puppet 2.6 (rejoice). This commit removes all unit tests that were targetted at that version. Change-Id: Ic1ced29f7d709f7c551468d730d5c7cc5a78c5a3 Reviewed-on: https://review.openstack.org/30375 Reviewed-by: Clark Boylan Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../config/puppet-module-jobs.yaml | 2 -- .../files/zuul/layout-dev.yaml | 8 -------- .../openstack_project/files/zuul/layout.yaml | 18 ------------------ 3 files changed, 28 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml index c0232091ee..4b05d6080c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml @@ -12,7 +12,6 @@ mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems bundle install - echo {puppet_version} | grep '2.6' && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true bundle exec rake spec SPEC_OPTS='--format documentation' publishers: @@ -49,7 +48,6 @@ - job-group: name: 'puppet-module-unit' puppet_version: - - 2.6 - 2.7 - 3.0 - 3.1 diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml index f5f7c44531..9e0471ac99 100644 --- a/modules/openstack_project/files/zuul/layout-dev.yaml +++ b/modules/openstack_project/files/zuul/layout-dev.yaml @@ -648,56 +648,48 @@ projects: - name: stackforge/puppet-cinder check: - - gate-puppet-cinder-puppet-unit-2.6 - gate-puppet-cinder-puppet-unit-2.7 - gate-puppet-cinder-puppet-unit-3.0 - gate-puppet-cinder-puppet-unit-3.1 - name: stackforge/puppet-glance check: - - gate-puppet-glance-puppet-unit-2.6 - gate-puppet-glance-puppet-unit-2.7 - gate-puppet-glance-puppet-unit-3.0 - gate-puppet-glance-puppet-unit-3.1 - name: stackforge/puppet-horizon check: - - gate-puppet-horizon-puppet-unit-2.6 - gate-puppet-horizon-puppet-unit-2.7 - gate-puppet-horizon-puppet-unit-3.0 - gate-puppet-horizon-puppet-unit-3.1 - name: stackforge/puppet-keystone check: - - gate-puppet-keystone-puppet-unit-2.6 - gate-puppet-keystone-puppet-unit-2.7 - gate-puppet-keystone-puppet-unit-3.0 - gate-puppet-keystone-puppet-unit-3.1 - name: stackforge/puppet-nova check: - - gate-puppet-nova-puppet-unit-2.6 - gate-puppet-nova-puppet-unit-2.7 - gate-puppet-nova-puppet-unit-3.0 - gate-puppet-nova-puppet-unit-3.1 - name: stackforge/puppet-quantum check: - - gate-puppet-quantum-puppet-unit-2.6 - gate-puppet-quantum-puppet-unit-2.7 - gate-puppet-quantum-puppet-unit-3.0 - gate-puppet-quantum-puppet-unit-3.1 - name: stackforge/puppet-openstack check: - - gate-puppet-openstack-puppet-unit-2.6 - gate-puppet-openstack-puppet-unit-2.7 - gate-puppet-openstack-puppet-unit-3.0 - gate-puppet-openstack-puppet-unit-3.1 - name: stackforge/puppet-swift check: - - gate-puppet-swift-puppet-unit-2.6 - gate-puppet-swift-puppet-unit-2.7 - gate-puppet-swift-puppet-unit-3.0 - gate-puppet-swift-puppet-unit-3.1 diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 03a5faaa50..587b94a7cb 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1574,108 +1574,90 @@ projects: - name: stackforge/puppet-ceilometer check: - - gate-puppet-ceilometer-puppet-unit-2.6 - gate-puppet-ceilometer-puppet-unit-2.7 - gate-puppet-ceilometer-puppet-unit-3.0 - gate-puppet-ceilometer-puppet-unit-3.1 gate: - - gate-puppet-ceilometer-puppet-unit-2.6 - gate-puppet-ceilometer-puppet-unit-2.7 - gate-puppet-ceilometer-puppet-unit-3.0 - gate-puppet-ceilometer-puppet-unit-3.1 - name: stackforge/puppet-cinder check: - - gate-puppet-cinder-puppet-unit-2.6 - gate-puppet-cinder-puppet-unit-2.7 - gate-puppet-cinder-puppet-unit-3.0 - gate-puppet-cinder-puppet-unit-3.1 gate: - - gate-puppet-cinder-puppet-unit-2.6 - gate-puppet-cinder-puppet-unit-2.7 - gate-puppet-cinder-puppet-unit-3.0 - gate-puppet-cinder-puppet-unit-3.1 - name: stackforge/puppet-glance check: - - gate-puppet-glance-puppet-unit-2.6 - gate-puppet-glance-puppet-unit-2.7 - gate-puppet-glance-puppet-unit-3.0 - gate-puppet-glance-puppet-unit-3.1 gate: - - gate-puppet-glance-puppet-unit-2.6 - gate-puppet-glance-puppet-unit-2.7 - gate-puppet-glance-puppet-unit-3.0 - gate-puppet-glance-puppet-unit-3.1 - name: stackforge/puppet-horizon check: - - gate-puppet-horizon-puppet-unit-2.6 - gate-puppet-horizon-puppet-unit-2.7 - gate-puppet-horizon-puppet-unit-3.0 - gate-puppet-horizon-puppet-unit-3.1 gate: - - gate-puppet-horizon-puppet-unit-2.6 - gate-puppet-horizon-puppet-unit-2.7 - gate-puppet-horizon-puppet-unit-3.0 - gate-puppet-horizon-puppet-unit-3.1 - name: stackforge/puppet-keystone check: - - gate-puppet-keystone-puppet-unit-2.6 - gate-puppet-keystone-puppet-unit-2.7 - gate-puppet-keystone-puppet-unit-3.0 - gate-puppet-keystone-puppet-unit-3.1 gate: - - gate-puppet-keystone-puppet-unit-2.6 - gate-puppet-keystone-puppet-unit-2.7 - gate-puppet-keystone-puppet-unit-3.0 - gate-puppet-keystone-puppet-unit-3.1 - name: stackforge/puppet-nova check: - - gate-puppet-nova-puppet-unit-2.6 - gate-puppet-nova-puppet-unit-2.7 - gate-puppet-nova-puppet-unit-3.0 - gate-puppet-nova-puppet-unit-3.1 gate: - - gate-puppet-nova-puppet-unit-2.6 - gate-puppet-nova-puppet-unit-2.7 - gate-puppet-nova-puppet-unit-3.0 - gate-puppet-nova-puppet-unit-3.1 - name: stackforge/puppet-quantum check: - - gate-puppet-quantum-puppet-unit-2.6 - gate-puppet-quantum-puppet-unit-2.7 - gate-puppet-quantum-puppet-unit-3.0 - gate-puppet-quantum-puppet-unit-3.1 gate: - - gate-puppet-quantum-puppet-unit-2.6 - gate-puppet-quantum-puppet-unit-2.7 - gate-puppet-quantum-puppet-unit-3.0 - gate-puppet-quantum-puppet-unit-3.1 - name: stackforge/puppet-openstack check: - - gate-puppet-openstack-puppet-unit-2.6 - gate-puppet-openstack-puppet-unit-2.7 - gate-puppet-openstack-puppet-unit-3.0 - gate-puppet-openstack-puppet-unit-3.1 gate: - - gate-puppet-openstack-puppet-unit-2.6 - gate-puppet-openstack-puppet-unit-2.7 - gate-puppet-openstack-puppet-unit-3.0 - gate-puppet-openstack-puppet-unit-3.1 - name: stackforge/puppet-swift check: - - gate-puppet-swift-puppet-unit-2.6 - gate-puppet-swift-puppet-unit-2.7 - gate-puppet-swift-puppet-unit-3.0 - gate-puppet-swift-puppet-unit-3.1 gate: - - gate-puppet-swift-puppet-unit-2.6 - gate-puppet-swift-puppet-unit-2.7 - gate-puppet-swift-puppet-unit-3.0 - gate-puppet-swift-puppet-unit-3.1