Get rid of precise||trusty job node declarations

Between the Icehouse and Juno releases, OpenStack changed its
supported Ubuntu LTS platform from Precise to Trusty. In support of
continuing testing stable/icehouse and prior branches on Precise
while starting to test newer branches on Trusty, a branch-based
decision tree was introduced into our Zuul configuration by way of
complex parameter functions with an ever growing list of regular
expression matches on job names.

Now that Icehouse is EOL (in fact, Juno is too) this simply adds
unnecessary complexity and an attractive nuisance for cargo-cult
copying into new job and job-template definitions which don't even
need it. In preparation to remove the associated parameter
functions, get rid of multiple labels in all jobs and set them to
whatever label Zuul would ultimately select.

This change touches a vast number, possibly a majority, of our jobs
and so manual jenkins-jobs updates on all Jenkins masters will be
needed after this merges, before it's safe to approve the
corresponding Zuul configuration cleanup.

Change-Id: Ic952ee02da2c77fe2ace81c4e2fa87531be6119c

jenkins/jobs/api-jobs.yaml

@@ -23,7 +23,7 @@
 
 - job:
     name: openstack-api-ref
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -42,7 +42,7 @@
 
 - job:
     name: openstack-api-ref-publish-lang
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -63,7 +63,7 @@
 # this copies static files from www
 - job:
     name: openstack-api-site
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -81,7 +81,7 @@
 - job:
     name: gate-compute-api-guide
     description: Build and draft the Compute API Guide from nova source.
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -96,7 +96,7 @@
 - job:
     name: compute-api-guide
     description: Build and publish the Compute API Guide from nova source.
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -114,7 +114,7 @@
 - job:
     name: python-openstacksdk-docs
     description: Build and publish the Python SDK docs from source.
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/astara.yaml

@@ -80,7 +80,7 @@
 
 - job:
     name: 'astara-appliance-buildimage'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs

jenkins/jobs/barbican.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-barbican-devstack-dsvm-oldstable
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -82,7 +82,7 @@
 
 - job:
     name: gate-barbican-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/bashate.yaml

@@ -1,7 +1,7 @@
 - job:
     # run bashate changes over devstack
     name: 'gate-bashate-devstack'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/bifrost.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'gate-bifrost-integration-coreosipa-cirros'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:
@@ -29,7 +29,7 @@
 
 - job:
     name: 'gate-bifrost-integration-dibipa-debian-nv'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/blazar.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-blazar-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/castellan.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-castellan-dsvm-functional
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/ceilometer.yaml

@@ -189,7 +189,7 @@
 
 - job:
     name: 'gate-ceilometer-dsvm-integration'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/chef-jobs.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-{name}-chef-unit'
-    node: '{node}'
+    node: bare-precise
 
     wrappers:
       - build-timeout:
@@ -86,7 +86,7 @@
 
 - job-template:
     name: 'gate-{name}-chef-lint'
-    node: '{node}'
+    node: bare-precise
 
     wrappers:
       - build-timeout:
@@ -108,7 +108,7 @@
 
 - job-template:
     name: 'gate-{name}-chef-style'
-    node: '{node}'
+    node: bare-precise
 
     wrappers:
       - build-timeout:
@@ -130,7 +130,7 @@
 
 - job:
     name: gate-openstack-chef-repo
-    node: 'bare-precise || bare-trusty'
+    node: bare-precise
 
     builders:
       - gerrit-git-prep

jenkins/jobs/cue.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-cue-integration-dsvm-{broker}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/devstack-gate.yaml

@@ -2454,7 +2454,7 @@
 # tempest suite with their project/plugin enabled.
 - job-template:
     name: '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -2523,7 +2523,7 @@
 # Runs the full tempest suite.
 - job-template:
     name: '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}'
-    node: 'devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -2751,7 +2751,7 @@
 
 - job:
     name: gate-devstack-gate-unittests
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/devstack.yaml

@@ -2,7 +2,7 @@
 # run_tests.sh entry point
 - job:
     name: gate-devstack-unit-tests
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -19,7 +19,7 @@
 # we cannot use the normal docs jobs.
 - job:
     name: devstack-publish-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -39,7 +39,7 @@
 
 - job:
     name: gate-devstack-publish-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/diskimage-builder.yaml

@@ -27,7 +27,7 @@
       - console-log
 - job:
     name: 'dib-buildimage-debian-ironic-agent'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs

jenkins/jobs/ec2-api.yaml

@@ -97,7 +97,7 @@
 
 - job:
     name: 'ec2-api-functional-neutron-dsvm-full'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -139,7 +139,7 @@
 
 - job:
     name: 'ec2-api-rally-dsvm-fakevirt'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/elastic-recheck.yaml

@@ -1,6 +1,6 @@
 - job:
     name: elastic-recheck-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/freezer.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-freezer-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/gerrit.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-gerrit-buck
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:
@@ -33,7 +33,7 @@
 
 - job:
     name: gerrit-package-buck
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/git.yaml

@@ -2,7 +2,7 @@
 
 - job-template:
     name: 'gate-{name}-commit-message'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:

jenkins/jobs/grenade.yaml

@@ -2,7 +2,7 @@
 # we cannot use the normal docs jobs.
 - job:
     name: grenade-publish-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -22,7 +22,7 @@
 
 - job:
     name: gate-grenade-publish-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/groups.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-groups-unittests
-    node: 'bare-precise'
+    node: bare-precise
 
     builders:
         - revoke-sudo
@@ -26,7 +26,7 @@
 
 - job-template:
     name: 'groups-release-{job-suffix}'
-    node: '{node}'
+    node: bare-precise
 
     builders:
         - revoke-sudo

jenkins/jobs/hacking.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: gate-hacking-integration-{target-project}
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/heat.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-heat-templates-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -32,7 +32,7 @@
 
 - job:
     name: 'heat-templates-buildimages'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs

jenkins/jobs/horizon.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-horizon-jshint
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -13,7 +13,7 @@
 
 - job:
     name: gate-horizon-dsvm-integration
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -68,7 +68,7 @@
 
 - job:
     name: gate-horizon-selenium-headless
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/infra-publications.yaml

@@ -1,7 +1,7 @@
 # simply copy the contents of the repository to the server, no building needed
 - job:
     name: infra-publications-publish
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -28,7 +28,7 @@
 
 - job:
     name: infra-publications-publish-index
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/infra.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-project-config-compare-xml
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -12,7 +12,7 @@
 
 - job:
     name: gate-project-config-gerrit
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -25,7 +25,7 @@
 
 - job:
     name: gate-project-config-irc-access
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -38,7 +38,7 @@
 
 - job:
     name: gate-project-config-grafyaml
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -51,7 +51,7 @@
 
 - job:
     name: gate-project-config-layout
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -64,7 +64,7 @@
 
 - job:
     name: gate-project-config-jenkins-project
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -77,7 +77,7 @@
 
 - job:
     name: gate-project-config-nodepool
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -90,7 +90,7 @@
 
 - job:
     name: gate-project-config-projects-yaml
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -184,7 +184,7 @@
 
 - job:
     name: irc-meetings-publish
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -216,7 +216,7 @@
 
 - job:
     name: gate-irc-meetings-tox-ical
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -238,7 +238,7 @@
 
 - job:
     name: gate-infra-ansible
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -252,7 +252,7 @@
 
 - job:
     name: gate-project-config-dib
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/ironic-python-agent-jobs.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'gate-ironic-python-agent-buildimage-coreos'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs
@@ -14,7 +14,7 @@
 
 - job:
     name: 'ironic-python-agent-buildimage-coreos'
-    node: 'bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs

jenkins/jobs/job-builder.yaml

@@ -1,6 +1,6 @@
 - job:
     name: jenkins-job-builder-compare-xml
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/manila.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-manila-tempest-dsvm-{description}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -53,7 +53,7 @@
 
 - job:
     name: gate-manilaclient-dsvm-neutron-functional
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -101,7 +101,7 @@
 
 - job-template:
     name: 'gate-manila-publishimage-{image-name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     builders:
       - link-logs
@@ -123,7 +123,7 @@
 
 - job-template:
     name: 'gate-manila-buildimage-{image-name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     builders:
       - link-logs
@@ -138,7 +138,7 @@
 
 - job:
     name: gate-manila-tempest-dsvm-glusterfs
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -196,7 +196,7 @@
 
 - job:
     name: gate-manila-tempest-dsvm-glusterfs-native
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -254,7 +254,7 @@
 
 - job:
     name: gate-manila-tempest-dsvm-hdfs
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/misc.yaml

@@ -49,4 +49,4 @@
     publishers:
       - console-log
 
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty

jenkins/jobs/monasca.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-monasca-api-tempest-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -40,7 +40,7 @@
 
 - job:
     name: gate-monasca-api-java-tempest-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -83,7 +83,7 @@
 
 - job:
     name: gate-monasca-persister-tempest-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -122,7 +122,7 @@
 
 - job:
     name: gate-monasca-persister-java-tempest-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/murano.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-murano-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -56,7 +56,7 @@
 # Murano and Congress integration functional tests
 - job:
     name: gate-murano-congress-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/nova-docker.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-tempest-dsvm-docker
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/openstack-planet.yaml

@@ -1,7 +1,7 @@
 # Not using the template because openstack-planet does not use tox.
 - job:
     name: 'gate-openstack-planet-unittest'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/openstack-publish-jobs.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: '{name}-docs'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -21,7 +21,7 @@
 
 - job-template:
     name: '{name}-docs-constraints'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -64,7 +64,7 @@
 # always published from master branch.
 - job-template:
     name: '{name}-releasenotes'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -87,7 +87,7 @@
 
 - job-template:
     name: 'gate-{name}-releasenotes'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:

jenkins/jobs/openstackid.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-openstackid-unittests
-    node: 'bare-precise'
+    node: bare-precise
 
     builders:
         - revoke-sudo
@@ -21,7 +21,7 @@
 
 - job-template:
     name: 'openstackid-release-{job-suffix}'
-    node: '{node}'
+    node: bare-precise
 
     builders:
         - revoke-sudo

jenkins/jobs/oslo.yaml

@@ -92,11 +92,11 @@
 #     jobs:
 #       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: check
-#           node: 'devstack-precise || devstack-trusty'
+#           node: devstack-trusty
 #           job-suffix: ''
 #           branch-override: default
 #       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: gate
-#           node: 'devstack-precise || devstack-trusty'
+#           node: devstack-trusty
 #           job-suffix: ''
 #           branch-override: default

jenkins/jobs/project-team-guide.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'project-team-guide-publish'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/python-barbicanclient.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-python-barbicanclient-devstack-dsvm-oldstable
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -40,7 +40,7 @@
 
 - job:
     name: gate-python-barbicanclient-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/python-bitrot-jobs.yaml

@@ -88,7 +88,7 @@
     name: python-kilo-bitrot-jobs
     branch: 'stable/kilo'
     branch-name: '-kilo'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
     jobs:
       - 'periodic-{name}-python27{branch-name}'
       - 'periodic-{name}-docs{branch-name}'
@@ -98,7 +98,7 @@
     name: python-liberty-bitrot-jobs
     branch: 'stable/liberty'
     branch-name: '-liberty'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
     jobs:
       - 'periodic-{name}-python27{branch-name}'
       - 'periodic-{name}-python27-constraints{branch-name}'

jenkins/jobs/python-jobs.yaml

@@ -330,7 +330,7 @@
 
 - job-template:
     name: '{name}-tarball'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -352,7 +352,7 @@
 
 - job-template:
     name: '{name}-tarball-constraints'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -374,7 +374,7 @@
 
 - job-template:
     name: '{name}-branch-tarball'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -398,7 +398,7 @@
 
 - job-template:
     name: '{name}-branch-tarball-constraints'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:
@@ -422,7 +422,7 @@
 
 - job-template:
     name: 'gate-{name}-requirements'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - print-template-name:

jenkins/jobs/python-storyboardclient.yaml

@@ -1,7 +1,7 @@
 # This is a non-standard docs job because it uses SCP instead of FTP
 - job:
     name: python-storyboardclient-infra-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/rally.yaml

@@ -207,7 +207,7 @@
 
 - job:
     name: 'gate-rally-dsvm-manila-multibackend'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -227,7 +227,7 @@
 
 - job:
     name: 'gate-rally-dsvm-manila-multibackend-no-ss'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -329,7 +329,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-ironic-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -389,7 +389,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-murano-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -410,7 +410,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-mistral-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -431,7 +431,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-cue-{broker}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -451,7 +451,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-designate-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -472,7 +472,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -495,7 +495,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-neutron-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -518,7 +518,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-fakevirt-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -541,7 +541,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-zaqar-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -563,7 +563,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-rally-{service}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -585,7 +585,7 @@
 
 - job-template:
     name: 'gate-{name}-integrate-dsvm-rally'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -603,7 +603,7 @@
 
 - job:
     name: 'gate-rally-dsvm-cli'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -648,7 +648,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-verify-{mode}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -777,7 +777,7 @@
 
 - job-template:
     name: 'gate-rally-dsvm-monasca-{name}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/sahara.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-sahara-dashboard-dsvm-integration
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:
@@ -100,7 +100,7 @@
 
 - job:
     name: 'check-sahara-extra-artifacts'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:
@@ -119,7 +119,7 @@
 
 - job:
     name: 'gate-sahara-extra-artifacts'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/selenium.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-{name}-selenium'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/solum.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'gate-solum-devstack-dsvm'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/specs-jobs.yaml

@@ -2,7 +2,7 @@
 
 - job-template:
     name: '{name}-publish-specs'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     # We want to publish to org/name but the scp publisher cannot remove paths,
     # so use a shell builder to move the content in the right place and publish
@@ -48,7 +48,7 @@
 - job:
     name: gate-generate-specs-site
     description: Render the specs sites templates without publishing them.
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - generate-specs-site
@@ -56,7 +56,7 @@
 - job:
     name: publish-specs-site
     description: Render the specs sites templates and publish them.
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - generate-specs-site

jenkins/jobs/static-publish-jobs.yaml

@@ -2,7 +2,7 @@
 
 - job-template:
     name: static-{name}-publish
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/storlets.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'gate-storlets-functional'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - gerrit-git-prep

jenkins/jobs/storyboard.yaml

@@ -1,7 +1,7 @@
 # This is a non-standard docs job because it uses SCP instead of FTP
 - job:
     name: storyboard-docs
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -59,4 +59,4 @@
               source: 'reports/**'
               keep-hierarchy: true
               copy-after-failure: true
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty

jenkins/jobs/tempest-jobs.yaml

@@ -3,12 +3,12 @@
     jobs:
       - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
           pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
+          node: devstack-trusty
           job-suffix: ''
           branch-override: default
       - '{pipeline}-tempest-dsvm-test-accounts-src-{name}{job-suffix}':
           pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
+          node: devstack-trusty
           job-suffix: ''
           branch-override: default
 
@@ -17,6 +17,6 @@
     jobs:
       - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
           pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
+          node: devstack-trusty
           job-suffix: '-liberty'
           branch-override: stable/liberty

jenkins/jobs/trove.yaml

@@ -1,6 +1,6 @@
 - job-template:
     name: 'gate-trove-buildimage-{datastore}'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - link-logs
@@ -29,7 +29,7 @@
 
 - job-template:
     name: 'gate-trove-functional-dsvm-{datastore}{job-suffix}'
-    node: 'devstack-precise || devstack-trusty'
+    node: devstack-trusty
 
     wrappers:
       - build-timeout:

jenkins/jobs/tuskar-ui.yaml

@@ -1,6 +1,6 @@
 - job:
     name: gate-tuskar-ui-jshint
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo

jenkins/jobs/zuul.yaml

@@ -1,6 +1,6 @@
 - job:
     name: 'dev-zuul-coverage'
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty
 
     builders:
       - revoke-sudo
@@ -30,4 +30,4 @@
       - test-results
       - console-log
 
-    node: 'bare-precise || bare-trusty'
+    node: bare-trusty