s/branch-designator/job-suffix/g

As clarkb suggested on #openstack-infra at 17:46 2015-10-22:
"maybe we should s/branch-designator/job-suffix/g in all those files
 as job-suffix makes more sense considering how branch-designator has been
 used".

The rename should make it easier for newcomers to understand
these jobs.

This renames branch-designator everywhere in jenkins/jobs/*.

Change-Id: Icb11271b958d92957fb9907ff03c0b898d7b76fc

jenkins/jobs/akanda.yaml

@@ -38,7 +38,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-akanda{branch-designator}'
+    name: '{pipeline}-functional-dsvm-akanda{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -59,7 +59,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-akanda-appliance-src{branch-designator}'
+    name: '{pipeline}-functional-dsvm-akanda-appliance-src{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/ceilometer.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -34,7 +34,7 @@
 
 
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-full{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -69,7 +69,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{branch-designator}'
+    name: 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -102,7 +102,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{branch-designator}'
+    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -144,7 +144,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometerclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ceilometerclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/cinder.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-cinderclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-cinderclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -37,7 +37,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-cinder-dsvm-apache{branch-designator}'
+    name: '{pipeline}-cinder-dsvm-apache{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/congress.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-congress-dsvm-api{branch-designator}'
+    name: '{pipeline}-congress-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/devstack-gate.yaml

@@ -39,7 +39,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -78,7 +78,7 @@
 # the main tempest-dsvm jobs will be using only released versions of
 # libraries.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -122,7 +122,7 @@
 # Expiration: once neutron replaces nova-network as the default, this
 # can be removed.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -155,7 +155,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}-plugin'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin'
     node: '{node}'
 
     wrappers:
@@ -205,7 +205,7 @@
 # rootwrap, olso.db, and oslo.messaging that can create performance
 # regressions in the API layer.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -239,7 +239,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-master-dsvm-full{branch-designator}'
+    name: '{pipeline}-tempest-master-dsvm-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -270,7 +270,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-non-isolated{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -300,7 +300,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-non-isolated{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -330,7 +330,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-test-accounts{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-test-accounts{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -361,7 +361,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -393,7 +393,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -425,7 +425,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -457,7 +457,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-tempest-master-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -490,7 +490,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -522,7 +522,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -556,7 +556,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v20-api{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -589,7 +589,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v20-api-legacy{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -627,7 +627,7 @@
 # that things like unstack.sh and clean.sh work correctly. This should
 # only be run on the devstack tree.
 - job-template:
-    name: '{pipeline}-devstack-dsvm-updown{branch-designator}'
+    name: '{pipeline}-devstack-dsvm-updown{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -665,7 +665,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-wsgi-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-nova-wsgi-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -697,7 +697,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-devstack-dsvm-cells{branch-designator}'
+    name: '{pipeline}-devstack-dsvm-cells{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -777,7 +777,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-trove{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-trove{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -812,7 +812,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -839,7 +839,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -866,7 +866,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -895,7 +895,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -935,7 +935,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -963,7 +963,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -991,7 +991,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1018,7 +1018,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1045,7 +1045,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-python-ironicclient-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1072,7 +1072,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-lib-src{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ironic-lib-src{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1099,7 +1099,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-cells{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-cells{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1133,7 +1133,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-large-ops{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1165,7 +1165,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-large-ops-testing{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1196,7 +1196,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-large-ops{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1229,7 +1229,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-large-ops-testing{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-large-ops-testing{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1262,7 +1262,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-postgres-zeromq-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1295,7 +1295,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-postgres-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1330,7 +1330,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-keystonev3-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1362,7 +1362,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1401,7 +1401,7 @@
 # ``*keystonev3-full*``, (which do not disable v2) should be replaced by this
 # one and the flag DEVSTACK_GATE_KEYSTONE_V3 will be no longer used.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1434,7 +1434,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm{branch-designator}'
+    name: '{pipeline}-grenade-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1466,7 +1466,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-forward{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-forward{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1498,7 +1498,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1531,7 +1531,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-forward{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1564,7 +1564,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-vpnaas{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-vpnaas{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1599,7 +1599,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-partial-ncpu{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1631,7 +1631,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ironic{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1672,7 +1672,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-partial-ironic{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-partial-ironic{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1711,7 +1711,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ironic-sideways{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1751,7 +1751,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-neutron-sideways{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1784,7 +1784,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ceilometer{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-ceilometer{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1817,7 +1817,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-all{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-all{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1849,7 +1849,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-coverage{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-coverage{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1880,7 +1880,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-stress{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-stress{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -1913,7 +1913,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-stress-keystonev3{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-stress-keystonev3{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2001,7 +2001,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2034,7 +2034,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-multinode{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-multinode{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2068,7 +2068,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2105,7 +2105,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2142,7 +2142,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2181,7 +2181,7 @@
 # but use the zuul git ref for name instead of the released library
 # version.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2219,7 +2219,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-lio{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2254,7 +2254,7 @@
 # but use the zuul git ref for name instead of the released library
 # version.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-lio-src-{name}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-lio-src-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2292,7 +2292,7 @@
 # A template for any project with a devstack-plugin to run the full
 # tempest suite with their project/plugin enabled.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -2324,7 +2324,7 @@
 # A Template to to run a oslo.messaging devstack-plugin with oslo.messaging
 # code picked up from source
 - job-template:
-    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}'
+    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -2357,7 +2357,7 @@
 # A template for the misnamed drbd-devstack project.
 # Runs the full tempest suite.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-drbd-devstack{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}'
     node: 'devstack-trusty'
 
     wrappers:
@@ -2393,7 +2393,7 @@
 
 
 - job-template:
-    name: '{pipeline}-cinder-tempest-dsvm-glusterfs{branch-designator}'
+    name: '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2433,7 +2433,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-bdd{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-full-bdd{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2467,7 +2467,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-trove{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-trove{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2499,7 +2499,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -2555,62 +2555,62 @@
 - job-group:
     name: devstack-jobs
     jobs:
-      - '{pipeline}-tempest-dsvm-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-largeops-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{branch-designator}'
-      - '{pipeline}-tempest-master-dsvm-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
-      - '{pipeline}-devstack-dsvm-cells{branch-designator}'
-      - '{pipeline}-devstack-dsvm-updown{branch-designator}'
-      - '{pipeline}-tempest-dsvm-cells{branch-designator}'
-      - '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-large-ops-testing{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
-      - '{pipeline}-grenade-dsvm{branch-designator}'
-      - '{pipeline}-grenade-dsvm-forward{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-vpnaas{branch-designator}'
-      - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ironic{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
-      - '{pipeline}-grenade-dsvm-partial-ironic{branch-designator}'
-      - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
-      - '{pipeline}-grenade-dsvm-ceilometer{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-parallel{branch-designator}'
-      - '{pipeline}-tempest-dsvm-all{branch-designator}'
-      - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
-      - '{pipeline}-tempest-dsvm-stress{branch-designator}'
-      - '{pipeline}-tempest-dsvm-stress-keystonev3{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-test-accounts{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-admin{branch-designator}'
-      - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-lio{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api-legacy{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-wsgi-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-trove{branch-designator}'
-      - '{pipeline}-grenade-dsvm-trove{branch-designator}'
-      - '{pipeline}-grenade-dsvm-sahara{branch-designator}'
+      - '{pipeline}-tempest-dsvm-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}'
+      - '{pipeline}-tempest-master-dsvm-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron{job-suffix}'
+      - '{pipeline}-tempest-master-dsvm-neutron{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
+      - '{pipeline}-devstack-dsvm-cells{job-suffix}'
+      - '{pipeline}-devstack-dsvm-updown{job-suffix}'
+      - '{pipeline}-tempest-dsvm-cells{job-suffix}'
+      - '{pipeline}-tempest-dsvm-large-ops{job-suffix}'
+      - '{pipeline}-tempest-dsvm-large-ops-testing{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-large-ops{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-large-ops-testing{job-suffix}'
+      - '{pipeline}-tempest-dsvm-postgres-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-postgres-zeromq-full{job-suffix}'
+      - '{pipeline}-grenade-dsvm{job-suffix}'
+      - '{pipeline}-grenade-dsvm-forward{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-forward{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-vpnaas{job-suffix}'
+      - '{pipeline}-grenade-dsvm-partial-ncpu{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ironic{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ironic-sideways{job-suffix}'
+      - '{pipeline}-grenade-dsvm-partial-ironic{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-sideways{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ceilometer{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-agent_ssh-src{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}'
+      - '{pipeline}-tempest-dsvm-all{job-suffix}'
+      - '{pipeline}-tempest-dsvm-coverage{job-suffix}'
+      - '{pipeline}-tempest-dsvm-stress{job-suffix}'
+      - '{pipeline}-tempest-dsvm-stress-keystonev3{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-test-accounts{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-non-isolated{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-admin{job-suffix}'
+      - '{pipeline}-tempest-dsvm-keystonev3-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
+      - '{pipeline}-tempest-dsvm-nova-wsgi-full{job-suffix}'
+      - '{pipeline}-tempest-dsvm-trove{job-suffix}'
+      - '{pipeline}-grenade-dsvm-trove{job-suffix}'
+      - '{pipeline}-grenade-dsvm-sahara{job-suffix}'

jenkins/jobs/dragonflow.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-dragonflow{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-dragonflow{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/ec2-api.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -43,7 +43,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-neutron-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-functional-neutron-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -85,7 +85,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-nova-network-dsvm-ec2api{branch-designator}'
+    name: '{pipeline}-functional-nova-network-dsvm-ec2api{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/gce-api.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-neutron-dsvm-gceapi{branch-designator}'
+    name: '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -40,7 +40,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-nova-network-dsvm-gceapi{branch-designator}'
+    name: '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/glance.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-glanceclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-glanceclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/group-based-policy.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-functional{branch-designator}'
+    name: '{pipeline}-group-based-policy-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -48,7 +48,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-rally{branch-designator}'
+    name: '{pipeline}-group-based-policy-dsvm-rally{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/groups.yaml

@@ -25,7 +25,7 @@
                   copy-after-failure: true
 
 - job-template:
-    name: 'groups-release-{branch-designator}'
+    name: 'groups-release-{job-suffix}'
     node: '{node}'
 
     builders:

jenkins/jobs/heat.yaml

@@ -53,7 +53,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}'
+    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -112,7 +112,7 @@
 
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{branch-designator}'
+    name: '{pipeline}-heat-dsvm-functional-aodh-{engine}-{datastore}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -172,7 +172,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-heat{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -204,7 +204,7 @@
 
 
 - job-template:
-   name: '{pipeline}-heatclient-dsvm-functional{branch-designator}'
+   name: '{pipeline}-heatclient-dsvm-functional{job-suffix}'
    node: '{node}'
 
    wrappers:
@@ -244,7 +244,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-heat{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-heat{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/ironic.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-ironic-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ironic-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -36,7 +36,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironicclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-ironicclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -76,7 +76,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-inspector-dsvm{branch-designator}'
+    name: '{pipeline}-ironic-inspector-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -119,7 +119,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-python-ironic-inspector-client-dsvm{branch-designator}'
+    name: '{pipeline}-python-ironic-inspector-client-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/javascript.yaml

@@ -105,7 +105,7 @@
 
 # Builds a release tarball
 - job-template:
-    name: '{name}-js-release-{branch-designator}'
+    name: '{name}-js-release-{job-suffix}'
 
     builders:
       - npm-install

jenkins/jobs/keystone.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-keystoneclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-keystoneclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/magnum.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-dsvm-magnum{branch-designator}'
+    name: '{pipeline}-functional-dsvm-magnum{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/murano.yaml

@@ -122,7 +122,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-muranoclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-muranoclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-bgpvpn.yaml

@@ -1,7 +1,7 @@
 # Inspiration largely taken from networking-ovn.yaml
 
 - job-template:
-    name: '{pipeline}-install-dsvm-networking-bgpvpn{branch-designator}'
+    name: '{pipeline}-install-dsvm-networking-bgpvpn{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-midonet.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v1{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-v1{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -55,7 +55,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v2{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-v2{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -108,7 +108,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-ml2{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-ml2{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-odl.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-odl{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-odl{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-onos.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-onos{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-onos{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-ovn.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-ovn{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-networking-ovn{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-fwaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-functional{branch-designator}'
+    name: '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-api{branch-designator}'
+    name: '{pipeline}-neutron-fwaas-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-lbaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{branch-designator}'
+    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-vpnaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -89,7 +89,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}'
+    name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-dsvm-api{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-api{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -44,7 +44,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -83,7 +83,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-functional{python}{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-functional{python}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -142,7 +142,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-fullstack{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-fullstack{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -187,7 +187,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}'
+    name: '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -231,7 +231,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -263,7 +263,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -295,7 +295,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/nodepool.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-dsvm-nodepool{branch-designator}'
+    name: '{pipeline}-dsvm-nodepool{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -51,7 +51,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dsvm-nodepool-src-shade{branch-designator}'
+    name: '{pipeline}-dsvm-nodepool-src-shade{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/nova.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-novaclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-novaclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/openstack-ansible-jobs.yaml

@@ -32,7 +32,7 @@
       - devstack-logs
 
 - job-template:
-    name: 'gate-{name}-commit{branch-designator}'
+    name: 'gate-{name}-commit{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/openstackid.yaml

@@ -20,7 +20,7 @@
                   copy-after-failure: true
 
 - job-template:
-    name: 'openstackid-release-{branch-designator}'
+    name: 'openstackid-release-{job-suffix}'
     node: '{node}'
 
     builders:

jenkins/jobs/osc.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-osc-dsvm-functional{branch-designator}'
+    name: '{pipeline}-osc-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/oslo.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}'
+    name: '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -86,13 +86,13 @@
 #     injectedrepo: openstack/oslotest
 #
 #     jobs:
-#       - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+#       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: check
 #           node: 'devstack-precise || devstack-trusty'
-#           branch-designator: ''
+#           job-suffix: ''
 #           branch-override: default
-#       - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+#       - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}':
 #           pipeline: gate
 #           node: 'devstack-precise || devstack-trusty'
-#           branch-designator: ''
+#           job-suffix: ''
 #           branch-override: default

jenkins/jobs/puppet-module-jobs.yaml

@@ -65,7 +65,7 @@
 
 
 - job-template:
-    name: 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{branch-designator}'
+    name: 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{job-suffix}'
     node: 'devstack-{ostype}'
 
     builders:
@@ -164,7 +164,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-puppet-openstack-integration-dsvm-multinode{branch-designator}'
+    name: 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}'
     node: '{node}'
 
     builders:
@@ -246,7 +246,7 @@
       - trusty
       - centos7
     jobs:
-      - 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{branch-designator}'
+      - 'gate-{name}-puppet-beaker-rspec-dsvm-{ostype}{job-suffix}'
 
 - job-group:
     name: 'puppet-openstack-integration-jobs'

jenkins/jobs/requirements.yaml

@@ -266,7 +266,7 @@
       - console-log
 
 - job-template:
-    name: propose-requirements-constraints{branch-designator}
+    name: propose-requirements-constraints{job-suffix}
     node: proposal
 
     builders:

jenkins/jobs/sahara.yaml

@@ -83,7 +83,7 @@
 
 
 - job-template:
-    name: '{pipeline}-saharaclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-saharaclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -121,7 +121,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-sahara{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-sahara{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -153,7 +153,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-sahara{branch-designator}'
+    name: '{pipeline}-grenade-dsvm-sahara{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -189,7 +189,7 @@
 
 
 - job-template:
-    name: '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}'
+    name: '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -242,7 +242,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/scalpels.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-scalpels-dsvm-neutron{branch-designator}'
+    name: '{pipeline}-scalpels-dsvm-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/sdk.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-sdk-dsvm-functional{branch-designator}'
+    name: '{pipeline}-sdk-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/senlin.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-senlin-dsvm-functional{branch-designator}'
+    name: '{pipeline}-senlin-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/shade.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-keystone2{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-keystone2{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -35,7 +35,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-neutron{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-neutron{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -71,7 +71,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-nova{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-nova{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/sqlalchemy-migrate.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}'
+    name: '{pipeline}-sqlalchemy-migrate-devstack-dsvm{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/swift.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-swift-dsvm-functional{branch-designator}'
+    name: '{pipeline}-swift-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -40,7 +40,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-swiftclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-swiftclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/swift3.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-swift3{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-swift3{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/tacker.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tacker-dsvm-functional{branch-designator}'
+    name: '{pipeline}-tacker-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/tempest-jobs.yaml

@@ -1,8 +1,8 @@
 - job-group:
     name: 'lib-forward-testing-{name}'
     jobs:
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
+          job-suffix: ''
           branch-override: default

jenkins/jobs/trove.yaml

@@ -28,7 +28,7 @@
 
 
 - job-template:
-    name: 'gate-trove-functional-dsvm-{datastore}{branch-designator}'
+    name: 'gate-trove-functional-dsvm-{datastore}{job-suffix}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -71,7 +71,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/zaqar.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-zaqarclient-dsvm-functional{branch-designator}'
+    name: '{pipeline}-zaqarclient-dsvm-functional{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -46,7 +46,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}'
     node: '{node}'
 
     wrappers: