From 10f44194c43dedfef9cd9d93af5cb413d1af8f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Tue, 7 Jan 2014 20:48:31 -0500 Subject: [PATCH] Remove unit tests against Puppet 3.0.x rspec-puppet doesn't work with Puppet 3.0.x anymore. This is caused by a bug within Puppet itself. There is no plan to release a fix for Puppet 3.0.x any time soon. There was also no solution found by rspec-puppet to restore support for Puppet 3.0.x. This change removes unit tests against Puppet 3.0.x so no more cycles are spent testing a broken version. Unit tests were non-voting anyway. Change-Id: I582d2be45afc3bbd21ee39e7255ca0e39da9840f --- .../config/puppet-module-jobs.yaml | 1 - .../openstack_project/files/zuul/layout.yaml | 34 ------------------- 2 files changed, 35 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 fae149ebf3..25f0e49393 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 @@ -40,7 +40,6 @@ name: 'puppet-module-unit' puppet_version: - 2.7 - - 3.0 - 3.1 - 3.2 - 3.3 diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f083e7aa34..2f526cee21 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -426,8 +426,6 @@ jobs: voting: false - name: gate-puppet-vswitch-puppet-syntax voting: false - - name: ^gate-puppet-.*-puppet-unit-3.0$ - voting: false - name: gate-tomograph-python33 voting: false @@ -3304,7 +3302,6 @@ projects: - gate-puppet-ceilometer-puppet-lint - gate-puppet-ceilometer-puppet-syntax - gate-puppet-ceilometer-puppet-unit-2.7 - - gate-puppet-ceilometer-puppet-unit-3.0 - gate-puppet-ceilometer-puppet-unit-3.1 - gate-puppet-ceilometer-puppet-unit-3.2 - gate-puppet-ceilometer-puppet-unit-3.3 @@ -3312,7 +3309,6 @@ projects: - gate-puppet-ceilometer-puppet-lint - gate-puppet-ceilometer-puppet-syntax - gate-puppet-ceilometer-puppet-unit-2.7 - - gate-puppet-ceilometer-puppet-unit-3.0 - gate-puppet-ceilometer-puppet-unit-3.1 - gate-puppet-ceilometer-puppet-unit-3.2 - gate-puppet-ceilometer-puppet-unit-3.3 @@ -3322,13 +3318,11 @@ projects: - gate-puppet-ceph-puppet-lint - gate-puppet-ceph-puppet-syntax - gate-puppet-ceph-puppet-unit-2.7 - - gate-puppet-ceph-puppet-unit-3.0 - gate-puppet-ceph-puppet-unit-3.1 gate: - gate-puppet-ceph-puppet-lint - gate-puppet-ceph-puppet-syntax - gate-puppet-ceph-puppet-unit-2.7 - - gate-puppet-ceph-puppet-unit-3.0 - gate-puppet-ceph-puppet-unit-3.1 - name: stackforge/puppet-cinder @@ -3336,7 +3330,6 @@ projects: - gate-puppet-cinder-puppet-lint - gate-puppet-cinder-puppet-syntax - gate-puppet-cinder-puppet-unit-2.7 - - gate-puppet-cinder-puppet-unit-3.0 - gate-puppet-cinder-puppet-unit-3.1 - gate-puppet-cinder-puppet-unit-3.2 - gate-puppet-cinder-puppet-unit-3.3 @@ -3344,7 +3337,6 @@ projects: - gate-puppet-cinder-puppet-lint - gate-puppet-cinder-puppet-syntax - gate-puppet-cinder-puppet-unit-2.7 - - gate-puppet-cinder-puppet-unit-3.0 - gate-puppet-cinder-puppet-unit-3.1 - gate-puppet-cinder-puppet-unit-3.2 - gate-puppet-cinder-puppet-unit-3.3 @@ -3354,7 +3346,6 @@ projects: - gate-puppet-designate-puppet-lint - gate-puppet-designate-puppet-syntax - gate-puppet-designate-puppet-unit-2.7 - - gate-puppet-designate-puppet-unit-3.0 - gate-puppet-designate-puppet-unit-3.1 - gate-puppet-designate-puppet-unit-3.2 - gate-puppet-designate-puppet-unit-3.3 @@ -3362,7 +3353,6 @@ projects: - gate-puppet-designate-puppet-lint - gate-puppet-designate-puppet-syntax - gate-puppet-designate-puppet-unit-2.7 - - gate-puppet-designate-puppet-unit-3.0 - gate-puppet-designate-puppet-unit-3.1 - gate-puppet-designate-puppet-unit-3.2 - gate-puppet-designate-puppet-unit-3.3 @@ -3372,7 +3362,6 @@ projects: - gate-puppet-glance-puppet-lint - gate-puppet-glance-puppet-syntax - gate-puppet-glance-puppet-unit-2.7 - - gate-puppet-glance-puppet-unit-3.0 - gate-puppet-glance-puppet-unit-3.1 - gate-puppet-glance-puppet-unit-3.2 - gate-puppet-glance-puppet-unit-3.3 @@ -3380,7 +3369,6 @@ projects: - gate-puppet-glance-puppet-lint - gate-puppet-glance-puppet-syntax - gate-puppet-glance-puppet-unit-2.7 - - gate-puppet-glance-puppet-unit-3.0 - gate-puppet-glance-puppet-unit-3.1 - gate-puppet-glance-puppet-unit-3.2 - gate-puppet-glance-puppet-unit-3.3 @@ -3390,7 +3378,6 @@ projects: - gate-puppet-heat-puppet-lint - gate-puppet-heat-puppet-syntax - gate-puppet-heat-puppet-unit-2.7 - - gate-puppet-heat-puppet-unit-3.0 - gate-puppet-heat-puppet-unit-3.1 - gate-puppet-heat-puppet-unit-3.2 - gate-puppet-heat-puppet-unit-3.3 @@ -3398,7 +3385,6 @@ projects: - gate-puppet-heat-puppet-lint - gate-puppet-heat-puppet-syntax - gate-puppet-heat-puppet-unit-2.7 - - gate-puppet-heat-puppet-unit-3.0 - gate-puppet-heat-puppet-unit-3.1 - gate-puppet-heat-puppet-unit-3.2 - gate-puppet-heat-puppet-unit-3.3 @@ -3408,7 +3394,6 @@ projects: - gate-puppet-horizon-puppet-lint - gate-puppet-horizon-puppet-syntax - gate-puppet-horizon-puppet-unit-2.7 - - gate-puppet-horizon-puppet-unit-3.0 - gate-puppet-horizon-puppet-unit-3.1 - gate-puppet-horizon-puppet-unit-3.2 - gate-puppet-horizon-puppet-unit-3.3 @@ -3416,7 +3401,6 @@ projects: - gate-puppet-horizon-puppet-lint - gate-puppet-horizon-puppet-syntax - gate-puppet-horizon-puppet-unit-2.7 - - gate-puppet-horizon-puppet-unit-3.0 - gate-puppet-horizon-puppet-unit-3.1 - gate-puppet-horizon-puppet-unit-3.2 - gate-puppet-horizon-puppet-unit-3.3 @@ -3426,7 +3410,6 @@ projects: - gate-puppet-ironic-puppet-lint - gate-puppet-ironic-puppet-syntax - gate-puppet-ironic-puppet-unit-2.7 - - gate-puppet-ironic-puppet-unit-3.0 - gate-puppet-ironic-puppet-unit-3.1 - gate-puppet-ironic-puppet-unit-3.2 - gate-puppet-ironic-puppet-unit-3.3 @@ -3434,7 +3417,6 @@ projects: - gate-puppet-ironic-puppet-lint - gate-puppet-ironic-puppet-syntax - gate-puppet-ironic-puppet-unit-2.7 - - gate-puppet-ironic-puppet-unit-3.0 - gate-puppet-ironic-puppet-unit-3.1 - gate-puppet-ironic-puppet-unit-3.2 - gate-puppet-ironic-puppet-unit-3.3 @@ -3444,7 +3426,6 @@ projects: - gate-puppet-keystone-puppet-lint - gate-puppet-keystone-puppet-syntax - gate-puppet-keystone-puppet-unit-2.7 - - gate-puppet-keystone-puppet-unit-3.0 - gate-puppet-keystone-puppet-unit-3.1 - gate-puppet-keystone-puppet-unit-3.2 - gate-puppet-keystone-puppet-unit-3.3 @@ -3452,7 +3433,6 @@ projects: - gate-puppet-keystone-puppet-lint - gate-puppet-keystone-puppet-syntax - gate-puppet-keystone-puppet-unit-2.7 - - gate-puppet-keystone-puppet-unit-3.0 - gate-puppet-keystone-puppet-unit-3.1 - gate-puppet-keystone-puppet-unit-3.2 - gate-puppet-keystone-puppet-unit-3.3 @@ -3462,7 +3442,6 @@ projects: - gate-puppet-neutron-puppet-lint - gate-puppet-neutron-puppet-syntax - gate-puppet-neutron-puppet-unit-2.7 - - gate-puppet-neutron-puppet-unit-3.0 - gate-puppet-neutron-puppet-unit-3.1 - gate-puppet-neutron-puppet-unit-3.2 - gate-puppet-neutron-puppet-unit-3.3 @@ -3470,7 +3449,6 @@ projects: - gate-puppet-neutron-puppet-lint - gate-puppet-neutron-puppet-syntax - gate-puppet-neutron-puppet-unit-2.7 - - gate-puppet-neutron-puppet-unit-3.0 - gate-puppet-neutron-puppet-unit-3.1 - gate-puppet-neutron-puppet-unit-3.2 - gate-puppet-neutron-puppet-unit-3.3 @@ -3480,7 +3458,6 @@ projects: - gate-puppet-nova-puppet-lint - gate-puppet-nova-puppet-syntax - gate-puppet-nova-puppet-unit-2.7 - - gate-puppet-nova-puppet-unit-3.0 - gate-puppet-nova-puppet-unit-3.1 - gate-puppet-nova-puppet-unit-3.2 - gate-puppet-nova-puppet-unit-3.3 @@ -3488,7 +3465,6 @@ projects: - gate-puppet-nova-puppet-lint - gate-puppet-nova-puppet-syntax - gate-puppet-nova-puppet-unit-2.7 - - gate-puppet-nova-puppet-unit-3.0 - gate-puppet-nova-puppet-unit-3.1 - gate-puppet-nova-puppet-unit-3.2 - gate-puppet-nova-puppet-unit-3.3 @@ -3498,7 +3474,6 @@ projects: - gate-puppet-openstack-puppet-lint - gate-puppet-openstack-puppet-syntax - gate-puppet-openstack-puppet-unit-2.7 - - gate-puppet-openstack-puppet-unit-3.0 - gate-puppet-openstack-puppet-unit-3.1 - gate-puppet-openstack-puppet-unit-3.2 - gate-puppet-openstack-puppet-unit-3.3 @@ -3506,7 +3481,6 @@ projects: - gate-puppet-openstack-puppet-lint - gate-puppet-openstack-puppet-syntax - gate-puppet-openstack-puppet-unit-2.7 - - gate-puppet-openstack-puppet-unit-3.0 - gate-puppet-openstack-puppet-unit-3.1 - gate-puppet-openstack-puppet-unit-3.2 - gate-puppet-openstack-puppet-unit-3.3 @@ -3528,7 +3502,6 @@ projects: - gate-puppet-savanna-puppet-lint - gate-puppet-savanna-puppet-syntax - gate-puppet-savanna-puppet-unit-2.7 - - gate-puppet-savanna-puppet-unit-3.0 - gate-puppet-savanna-puppet-unit-3.1 - gate-puppet-savanna-puppet-unit-3.2 - gate-puppet-savanna-puppet-unit-3.3 @@ -3536,7 +3509,6 @@ projects: - gate-puppet-savanna-puppet-lint - gate-puppet-savanna-puppet-syntax - gate-puppet-savanna-puppet-unit-2.7 - - gate-puppet-savanna-puppet-unit-3.0 - gate-puppet-savanna-puppet-unit-3.1 - gate-puppet-savanna-puppet-unit-3.2 - gate-puppet-savanna-puppet-unit-3.3 @@ -3546,7 +3518,6 @@ projects: - gate-puppet-swift-puppet-lint - gate-puppet-swift-puppet-syntax - gate-puppet-swift-puppet-unit-2.7 - - gate-puppet-swift-puppet-unit-3.0 - gate-puppet-swift-puppet-unit-3.1 - gate-puppet-swift-puppet-unit-3.2 - gate-puppet-swift-puppet-unit-3.3 @@ -3554,7 +3525,6 @@ projects: - gate-puppet-swift-puppet-lint - gate-puppet-swift-puppet-syntax - gate-puppet-swift-puppet-unit-2.7 - - gate-puppet-swift-puppet-unit-3.0 - gate-puppet-swift-puppet-unit-3.1 - gate-puppet-swift-puppet-unit-3.2 - gate-puppet-swift-puppet-unit-3.3 @@ -3564,7 +3534,6 @@ projects: - gate-puppet-tempest-puppet-lint - gate-puppet-tempest-puppet-syntax - gate-puppet-tempest-puppet-unit-2.7 - - gate-puppet-tempest-puppet-unit-3.0 - gate-puppet-tempest-puppet-unit-3.1 - gate-puppet-tempest-puppet-unit-3.2 - gate-puppet-tempest-puppet-unit-3.3 @@ -3572,7 +3541,6 @@ projects: - gate-puppet-tempest-puppet-lint - gate-puppet-tempest-puppet-syntax - gate-puppet-tempest-puppet-unit-2.7 - - gate-puppet-tempest-puppet-unit-3.0 - gate-puppet-tempest-puppet-unit-3.1 - gate-puppet-tempest-puppet-unit-3.2 - gate-puppet-tempest-puppet-unit-3.3 @@ -3582,11 +3550,9 @@ projects: - gate-puppet-vswitch-puppet-lint - gate-puppet-vswitch-puppet-syntax - gate-puppet-vswitch-puppet-unit-2.7 - - gate-puppet-vswitch-puppet-unit-3.0 - gate-puppet-vswitch-puppet-unit-3.1 gate: - gate-puppet-vswitch-puppet-unit-2.7 - - gate-puppet-vswitch-puppet-unit-3.0 - gate-puppet-vswitch-puppet-unit-3.1 - name: stackforge/pycadf