Merge "Only run stackforge/puppet-* unit tests on trusty"

jenkins/jobs/projects.yaml

@@ -2979,7 +2979,7 @@
 
 - project:
     name: puppet-ceilometer
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -2988,7 +2988,7 @@
 
 - project:
     name: puppet-ceph
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -2997,7 +2997,7 @@
 
 - project:
     name: puppet-cinder
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3006,7 +3006,7 @@
 
 - project:
     name: puppet-designate
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3015,7 +3015,7 @@
 
 - project:
     name: puppet-glance
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3024,7 +3024,7 @@
 
 - project:
     name: puppet-heat
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3033,7 +3033,7 @@
 
 - project:
     name: puppet-horizon
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3042,7 +3042,7 @@
 
 - project:
     name: puppet-ironic
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3051,7 +3051,7 @@
 
 - project:
     name: puppet-keystone
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3060,7 +3060,7 @@
 
 - project:
     name: puppet-manila
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3069,7 +3069,7 @@
 
 - project:
     name: puppet-n1k-vsm
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3079,7 +3079,7 @@
 
 - project:
     name: puppet-neutron
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3088,7 +3088,7 @@
 
 - project:
     name: puppet-nova
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3097,7 +3097,7 @@
 
 - project:
     name: puppet-openstack
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3106,7 +3106,7 @@
 
 - project:
     name: puppet-openstack_extras
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3115,7 +3115,7 @@
 
 - project:
     name: puppet-openstacklib
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3124,7 +3124,7 @@
 
 - project:
     name: puppet-sahara
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3133,7 +3133,7 @@
 
 - project:
     name: puppet-swift
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3142,7 +3142,7 @@
 
 - project:
     name: puppet-tempest
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3151,7 +3151,7 @@
 
 - project:
     name: puppet-trove
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -3160,7 +3160,7 @@
 
 - project:
     name: puppet-vswitch
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:

zuul/openstack_functions.py

@@ -98,6 +98,7 @@ def set_node_options(item, job, params, default):
     python33_re = r'^.*-(py(thon)?33|33).*$'
     tripleo_re = r'^.*-tripleo.*$'
     devstack_re = r'^.*-dsvm.*$'
+    puppetunit_re = r'^gate-puppet-.*-puppet-unit.*$'
     # jobs run on the proposal worker
     if re.match(proposal_re, job.name) or re.match(pypi_re, job.name):
         reusable_node(item, job, params)
@@ -121,6 +122,9 @@ def set_node_options(item, job, params, default):
     elif re.match(tripleo_re, job.name):
         # Pass because job specified label is always correct.
         pass
+    # Puppet-OpenStack jobs
+    elif re.match(puppetunit_re, job.name):
+        pass
     # Jobs needing devstack slaves
     elif re.match(devstack_re, job.name):
         devstack_params(item, job, params)