Change job-suffix to suffix

We have now some rather long job-template names, shorten them with
replacing job-suffix with suffix.

Before this change we had 1500 usages of job-suffix and 700 of just
suffix. This change therefore unifies to one setting.

Note that this does not change any job names at all, they are unchanged,
it changes and shortens only the names of job-templates.

Change-Id: I514df039a848d9f6619bca3adc05dfb84a761fc9

jenkins/jobs/ansible-role-jobs.yaml

@@ -21,7 +21,7 @@
       - 'gate-{name}-ansible-lint'
 
 - job-template:
-    name: '{pipeline}-{name}-dsvm-ansible-func-{ostype}{job-suffix}'
+    name: '{pipeline}-{name}-dsvm-ansible-func-{ostype}{suffix}'
     node: '{ostype}'
 
     wrappers:
@@ -64,7 +64,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-{name}-ansible-{scenario}-{ostype}{job-suffix}'
+    name: '{pipeline}-{name}-ansible-{scenario}-{ostype}{suffix}'
     node: '{ostype}'
 
     wrappers:
@@ -109,14 +109,14 @@
     jobs:
       - 'gate-{name}-docs-{node}'
       - 'gate-{name}-linters-{node}'
-      - '{pipeline}-{name}-ansible-{scenario}-{ostype}{job-suffix}':
+      - '{pipeline}-{name}-ansible-{scenario}-{ostype}{suffix}':
           ostype:
             - centos-7
             - ubuntu-trusty
             - ubuntu-xenial
           pipeline: gate
           scenario: func
-          job-suffix:
+          suffix:
             - '-nv'
             - ''
       - '{name}-announce-release'
@@ -129,14 +129,14 @@
     jobs:
       - 'gate-{name}-docs-{node}'
       - 'gate-{name}-linters-{node}'
-      - '{pipeline}-{name}-dsvm-ansible-func-{ostype}{job-suffix}':
+      - '{pipeline}-{name}-dsvm-ansible-func-{ostype}{suffix}':
           branch-override: default
           ostype:
             - centos-7
             - ubuntu-trusty
             - ubuntu-xenial
           pipeline: gate
-          job-suffix:
+          suffix:
             - '-nv'
             - ''
       - '{name}-announce-release'

jenkins/jobs/astara.yaml

@@ -36,7 +36,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-astara-{node}{job-suffix}'
+    name: '{pipeline}-functional-dsvm-astara-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -57,7 +57,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-dsvm-astara-appliance-src-{node}{job-suffix}'
+    name: '{pipeline}-functional-dsvm-astara-appliance-src-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/ceilometer.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-ceilometer-dsvm-tempest-plugin-{backend}{special}{network}-{node}{job-suffix}'
+    name: 'gate-ceilometer-dsvm-tempest-plugin-{backend}{special}{network}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -38,7 +38,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{special}-{node}{job-suffix}'
+    name: '{pipeline}-ceilometer-dsvm-functional-{backend}{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -82,7 +82,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ceilometerclient-dsvm-functional{special}-{node}{job-suffix}'
+    name: '{pipeline}-ceilometerclient-dsvm-functional{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -211,7 +211,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}-{node}{job-suffix}'
+    name: 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/cells.yaml

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

jenkins/jobs/cinder.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-cinderclient-dsvm-functional{special}-{node}{job-suffix}'
+    name: '{pipeline}-cinderclient-dsvm-functional{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -39,7 +39,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-brick-cinderclient-ext-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-brick-cinderclient-ext-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -76,7 +76,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-cinder-dsvm-apache-{node}{job-suffix}'
+    name: '{pipeline}-cinder-dsvm-apache-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/cloudkitty.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-cloudkitty-dsvm-install{job-suffix}'
+    name: '{pipeline}-cloudkitty-dsvm-install{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/congress.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-congress-dsvm-api-{node}{job-suffix}'
+    name: '{pipeline}-congress-dsvm-api-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -71,7 +71,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-congress-pe-replicated{job-suffix}'
+    name: '{pipeline}-congress-pe-replicated{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/designate.yaml

@@ -1,6 +1,6 @@
 # Job for Designate+Tempest
 - job-template:
-    name: 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}'
+    name: 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -59,7 +59,7 @@
 
 # Job for Designate+Tempest with an Agent based Backend
 - job-template:
-    name: 'gate-tempest-dsvm-designate-agent-{designate-driver}-{node}{job-suffix}'
+    name: 'gate-tempest-dsvm-designate-agent-{designate-driver}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -105,7 +105,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-grenade-dsvm-designate-{designate-driver}-{node}{job-suffix}'
+    name: 'gate-grenade-dsvm-designate-{designate-driver}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/devstack-gate.yaml

@@ -39,7 +39,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -81,7 +81,7 @@
 # the main tempest-dsvm jobs will be using only released versions of
 # libraries.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-head-{name}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-head-{name}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -139,7 +139,7 @@
 # Expiration: once neutron replaces nova-network as the default, this
 # can be removed.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -184,7 +184,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-{name}-plugin-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-{name}-plugin-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -219,7 +219,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-test-accounts-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-test-accounts-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -251,7 +251,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -284,7 +284,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -318,7 +318,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -352,7 +352,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -388,7 +388,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v20-api-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -422,7 +422,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-os-vif-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-nova-os-vif-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -460,7 +460,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-{node}{job-suffix}'
+    name: '{pipeline}-devstack-dsvm-updown-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -500,7 +500,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -533,7 +533,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -570,7 +570,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-lxc-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -605,7 +605,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-trove{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-trove{suffix}'
     node: '{node}'
 
     wrappers:
@@ -641,7 +641,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-zeromq-multibackend-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-zeromq-multibackend-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -676,7 +676,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -712,7 +712,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-oslo-latest-full{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-oslo-latest-full{suffix}'
     node: '{node}'
 
     wrappers:
@@ -785,7 +785,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -821,7 +821,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-src-grenade-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-{name}-src-grenade-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -866,7 +866,7 @@
     # and for liberty and mitaka. It cannot run on newton because
     # nova net doesn't exist in ocata. For this reason we don't have a xenial
     # version of the job.
-    name: '{pipeline}-grenade-dsvm-forward-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-forward-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -902,7 +902,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -938,7 +938,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-libs-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-libs-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -981,7 +981,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-forward-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-forward-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1015,7 +1015,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1051,7 +1051,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-cinder-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-cinder-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1085,7 +1085,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-dvr-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-dvr-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1121,7 +1121,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-linuxbridge-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-linuxbridge-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1155,7 +1155,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ceilometer-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-ceilometer-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1188,7 +1188,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-all{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-all{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1220,7 +1220,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-keystone-eventlet-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-keystone-eventlet-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1254,7 +1254,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-keystone-uwsgi-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-keystone-uwsgi-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1288,7 +1288,7 @@
 
 # "platform" test -- run on an alternative node
 - job-template:
-    name: '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-platform-{name}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1317,7 +1317,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-multinode-full-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-multinode-full-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1353,7 +1353,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-multinode-live-migration-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-multinode-live-migration-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1393,7 +1393,7 @@
 - job-template:
     # This job is trusty only because it tests with nova net which
     # isn't supported in ocata/master.
-    name: '{pipeline}-grenade-dsvm-multinode{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-multinode{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1431,7 +1431,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-multinode-live-migration{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-multinode-live-migration{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1475,7 +1475,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-src-grenade-dsvm-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-{name}-src-grenade-dsvm-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1517,7 +1517,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-multinode-full-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-multinode-full-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1556,7 +1556,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1594,7 +1594,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-devstack-plugin-ceph-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-devstack-plugin-ceph-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1628,7 +1628,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph-plugin-src-{name}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-ceph-plugin-src-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1664,7 +1664,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-devstack-plugin-nfs{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-devstack-plugin-nfs{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1699,7 +1699,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-lio-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-lio-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1732,7 +1732,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-lvm-multibackend-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-lvm-multibackend-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1767,7 +1767,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}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-lio-src-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1801,11 +1801,11 @@
       - devstack-logs
       - console-log
 
-# {pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}{job-suffix} - run a devstack
+# {pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}{suffix} - run a devstack
 # plugin tempest job, but use the zuul git ref for srcname instead of the
 # released library version.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1839,7 +1839,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}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-{plugin}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1872,7 +1872,7 @@
 # A template for the misnamed drbd-devstack project.
 # Runs the full tempest suite.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-drbd-devstack-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-drbd-devstack-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1908,7 +1908,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-full-bdd{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-full-bdd{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1946,7 +1946,7 @@
 
 # run the tests for all the layer4 services together. This means we know they all work.
 - job-template:
-    name: '{pipeline}-tempest-dsvm-layer4-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-layer4-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1987,7 +1987,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-trove-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-trove-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -2037,7 +2037,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
     node: '{node}'
 
     wrappers:
@@ -2072,7 +2072,7 @@
 
 
 - job-template:
-    name: 'gate-dsvm-os-loganalyze{job-suffix}'
+    name: 'gate-dsvm-os-loganalyze{suffix}'
     node: '{node}'
 
     wrappers:
@@ -2141,21 +2141,21 @@
 - job-group:
     name: devstack-periodic-master-jobs
     jobs:
-      - '{pipeline}-tempest-dsvm-all{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-oslo-latest-full{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
+      - '{pipeline}-tempest-dsvm-all{suffix}'
+      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-oslo-latest-full{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
 
 # Jobs will get defined for stable branches in the periodic pipeline, and
 # for stable branches gate jobs.
 - job-group:
     name: devstack-stable-jobs
     jobs:
-      - '{pipeline}-tempest-dsvm-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}'
 
 # Temporary job group used so that we don't have to support node in
 # all jobs included in devstack-jobs right away. Once all do we can
@@ -2164,31 +2164,31 @@
 - job-group:
     name: devstack-jobs-xenial
     jobs:
-      - '{pipeline}-grenade-dsvm-neutron-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-neutron-forward-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-ironic-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-ceilometer-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-cells-{node}{job-suffix}'
-      - '{pipeline}-devstack-dsvm-updown-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-ssh{job-suffix}'
-      - '{pipeline}-tempest-dsvm-layer4-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-lio-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-lvm-multibackend-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-lvm-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-zeromq-multibackend-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-scenario-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-lxc-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-trove-{node}{job-suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-forward-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-ironic-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-ceilometer-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-cells-{node}{suffix}'
+      - '{pipeline}-devstack-dsvm-updown-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-ssh{suffix}'
+      - '{pipeline}-tempest-dsvm-layer4-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-lio-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-lvm-multibackend-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-lvm-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-zeromq-multibackend-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-trove-{node}{suffix}'
       # NOTE(mriedem): gate-grenade-dsvm-ubuntu-xenial is intentionally omitted
       # from this list as stable/newton grenade jobs upgrade from trusty nodes
       # and ocata changes only run with nova-network in cells v1 configurations
@@ -2198,27 +2198,27 @@
 - job-group:
     name: devstack-jobs
     jobs:
-      - '{pipeline}-grenade-dsvm-ceilometer-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-forward-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-neutron-forward-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-ironic-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-neutron-{node}{job-suffix}'
-      - '{pipeline}-grenade-dsvm-trove{job-suffix}'
-      - '{pipeline}-grenade-dsvm-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-cells-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-lio-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-layer4-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-lvm-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-dvr-ovs-native-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-ovs-native-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-trove-{node}{job-suffix}'
+      - '{pipeline}-grenade-dsvm-ceilometer-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-forward-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-forward-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-ironic-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-neutron-{node}{suffix}'
+      - '{pipeline}-grenade-dsvm-trove{suffix}'
+      - '{pipeline}-grenade-dsvm-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-cells-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-lio-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-layer4-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-lvm-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-dvr-ovs-native-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-dvr-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-ovs-native-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-nova-wsgi-full-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-trove-{node}{suffix}'

jenkins/jobs/diskimage-builder.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-dib-dsvm-functests-{node}{job-suffix}'
+    name: 'gate-dib-dsvm-functests-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/dragonflow.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-dragonflow-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-dragonflow-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -43,7 +43,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dragonflow-dsvm-rally-{node}{job-suffix}'
+    name: '{pipeline}-dragonflow-dsvm-rally-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -88,7 +88,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dragonflow-dsvm-fullstack-{node}{job-suffix}'
+    name: '{pipeline}-dragonflow-dsvm-fullstack-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/ec2-api.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-{network}-dsvm-ec2api-{node}{job-suffix}'
+    name: '{pipeline}-functional-{network}-dsvm-ec2api-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -41,7 +41,7 @@
       - console-log
 
 - job-template:
-    name: 'ec2-api-functional-neutron-dsvm-full-{node}{job-suffix}'
+    name: 'ec2-api-functional-neutron-dsvm-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -80,7 +80,7 @@
       - console-log
 
 - job-template:
-    name: 'ec2-api-rally-dsvm-fakevirt-{node}{job-suffix}'
+    name: 'ec2-api-rally-dsvm-fakevirt-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/freezer.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-osbackup-{name}-dsvm-{node}{job-suffix}'
+    name: 'gate-osbackup-{name}-dsvm-{node}{suffix}'
     node: '{node}'
     wrappers:
       - build-timeout:

jenkins/jobs/gce-api.yaml

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

jenkins/jobs/glance.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-glanceclient-dsvm-functional{special}-{node}{job-suffix}'
+    name: '{pipeline}-glanceclient-dsvm-functional{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -38,7 +38,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-glance_store-dsvm-functional-{driver}-{node}{job-suffix}'
+    name: '{pipeline}-glance_store-dsvm-functional-{driver}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/group-based-policy.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-group-based-policy-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -47,7 +47,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-nfp-{node}{job-suffix}'
+    name: '{pipeline}-group-based-policy-dsvm-nfp-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -95,7 +95,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-aim-{node}{job-suffix}'
+    name: '{pipeline}-group-based-policy-dsvm-aim-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -143,7 +143,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-group-based-policy-dsvm-rally-{node}{job-suffix}'
+    name: '{pipeline}-group-based-policy-dsvm-rally-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/groups.yaml

@@ -26,7 +26,7 @@
         - console-log
 
 - job-template:
-    name: 'groups-release-{job-suffix}'
+    name: 'groups-release-{suffix}'
     node: ubuntu-trusty
 
     builders:

jenkins/jobs/heat.yaml

@@ -32,7 +32,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}'
+    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -132,7 +132,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat{special}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-heat{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -167,7 +167,7 @@
 
 
 - job-template:
-   name: '{pipeline}-heatclient-dsvm-functional-{node}{job-suffix}'
+   name: '{pipeline}-heatclient-dsvm-functional-{node}{suffix}'
    node: '{node}'
 
    wrappers:
@@ -209,7 +209,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-heat-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-heat-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -266,7 +266,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat-apache-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-heat-apache-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/infra.yaml

@@ -95,7 +95,7 @@
       - console-log
 
 - job-template:
-    name: gate-{name}-bindep-fallback-{node}{job-suffix}
+    name: gate-{name}-bindep-fallback-{node}{suffix}
 
     wrappers:
       - timestamps
@@ -114,7 +114,7 @@
 - job-group:
     name: bindep-fallback-tests
 
-    job-suffix: ''
+    suffix: ''
     node:
       - centos-7
       - debian-jessie
@@ -124,7 +124,7 @@
       - ubuntu-xenial
 
     jobs:
-      - gate-{name}-bindep-fallback-{node}{job-suffix}
+      - gate-{name}-bindep-fallback-{node}{suffix}
 
 - builder:
     name: infra-puppet-apply-prep

jenkins/jobs/ironic.yaml

@@ -257,7 +257,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
 - job-template:
-    name: '{pipeline}-ironic-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-ironic-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -301,7 +301,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironicclient-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-ironicclient-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -341,7 +341,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-inspector-dsvm-{ramdisk}-{node}{job-suffix}'
+    name: '{pipeline}-ironic-inspector-dsvm-{ramdisk}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -404,7 +404,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-inspector-dsvm-discovery-{node}{job-suffix}'
+    name: '{pipeline}-ironic-inspector-dsvm-discovery-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -459,7 +459,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-python-ironic-inspector-client-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-python-ironic-inspector-client-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -516,7 +516,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-staging-drivers-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-ironic-staging-drivers-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -553,7 +553,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -582,7 +582,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -612,7 +612,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-lib-{image-type}-{driver}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-lib-{image-type}-{driver}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -643,7 +643,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -675,7 +675,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -704,7 +704,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-{driver}-postgres-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-{driver}-postgres-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -736,7 +736,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-parallel-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-parallel-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -781,7 +781,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipmitool-pyghmi-src-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipmitool-pyghmi-src-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -812,7 +812,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipmitool-virtualbmc-src-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ipmitool-virtualbmc-src-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -844,7 +844,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-python-ironicclient-src-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-python-ironicclient-src-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -875,7 +875,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-multitenant-network-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-multitenant-network-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -906,7 +906,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-inspector{src}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-inspector{src}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -938,7 +938,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-python-ironic-inspector-client-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-python-ironic-inspector-client-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -971,7 +971,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-inspector-discovery-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-inspector-discovery-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1003,7 +1003,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-ironic-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1054,7 +1054,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic-multitenant-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-ironic-multitenant-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1084,7 +1084,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-ironic-inspector-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-ironic-inspector-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1140,7 +1140,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-dsvm-multitest-{node}{job-suffix}'
+    name: '{pipeline}-ironic-dsvm-multitest-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/javascript.yaml

@@ -375,7 +375,7 @@
 
 # Builds a release tarball
 - job-template:
-    name: '{name}-js-release-{job-suffix}'
+    name: '{name}-js-release-{suffix}'
     node: ubuntu-xenial
 
     builders:

jenkins/jobs/karbor.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-karbor-dsvm-fullstack{job-suffix}'
+    name: '{pipeline}-karbor-dsvm-fullstack{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/keystone.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-keystone-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-keystone-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -31,7 +31,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-keystone-dsvm-functional-v3-only-{node}{job-suffix}'
+    name: '{pipeline}-keystone-dsvm-functional-v3-only-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -65,7 +65,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-keystoneclient-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-keystoneclient-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/kolla-ansible.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-ansible-dsvm-{action}-{distro}-{type}-{node}{job-suffix}'
+    name: '{pipeline}-kolla-ansible-dsvm-{action}-{distro}-{type}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/kolla-kubernetes.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}-{config}{job-suffix}'
+    name: '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}-{config}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/kolla.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}'
+    name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -23,7 +23,7 @@
       - console-log
 
 - job-template:
-    name: 'kolla-dsvm-build-{distro}-{type}-{node}{job-suffix}'
+    name: 'kolla-dsvm-build-{distro}-{type}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -53,17 +53,17 @@
 
 - job-group:
     name: 'kolla-publish-image-jobs'
-    job-suffix: ''
+    suffix: ''
     type:
       - binary
       - source
     jobs:
-      - 'kolla-dsvm-build-{distro}-{type}-{node}{job-suffix}':
+      - 'kolla-dsvm-build-{distro}-{type}-{node}{suffix}':
           distro: ubuntu
           node:
             - ubuntu-trusty
             - ubuntu-xenial
-      - 'kolla-dsvm-build-{distro}-{type}-{node}{job-suffix}':
+      - 'kolla-dsvm-build-{distro}-{type}-{node}{suffix}':
           distro:
             - centos
             - oraclelinux

jenkins/jobs/kuryr.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{job-suffix}'
+    name: '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -38,7 +38,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -91,7 +91,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/lvm.yaml

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

jenkins/jobs/magnum.yaml

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

jenkins/jobs/monasca.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}'
+    name: 'gate-tempest-dsvm-monasca-python-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -47,7 +47,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}'
+    name: 'gate-tempest-dsvm-monasca-java-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -100,18 +100,18 @@
 - job-group:
     name: 'tempest-monasca-full-jobs'
     jobs:
-      - 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-python-full-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
             - 'ubuntu-xenial'
-          job-suffix:
+          suffix:
             - ''
             - '-nv'
-      - 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
+      - 'gate-tempest-dsvm-monasca-java-full-{node}{suffix}':
           node:
             - 'ubuntu-trusty'
             - 'ubuntu-xenial'
-          job-suffix:
+          suffix:
             - ''
             - '-nv'
 

jenkins/jobs/murano.yaml

@@ -50,7 +50,7 @@
 
 # Murano and Congress integration functional tests
 - job-template:
-    name: 'gate-murano-congress-devstack-dsvm-{node}{job-suffix}'
+    name: 'gate-murano-congress-devstack-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -110,7 +110,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-muranoclient-dsvm-functional-{mode}-{node}{job-suffix}'
+    name: '{pipeline}-muranoclient-dsvm-functional-{mode}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -173,7 +173,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-tempest-dsvm-murano-{mode}-{node}{job-suffix}'
+    name: 'gate-tempest-dsvm-murano-{mode}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-bagpipe.yaml

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

jenkins/jobs/networking-bgpvpn.yaml

@@ -1,7 +1,7 @@
 # Inspiration largely taken from networking-ovn.yaml
 
 - job-template:
-    name: '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}-{node}{job-suffix}'
+    name: '{pipeline}-networking-bgpvpn-dsvm-{bgpvpntest}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -60,7 +60,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}-{node}{job-suffix}'
+    name: '{pipeline}-networking-bgpvpn-bagpipe-dsvm-{bgpvpntest}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -118,7 +118,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-bgpvpn-bagpipe-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-calico.yaml

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

jenkins/jobs/networking-generic-switch.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-networking-generic-switch-dsvm{job-suffix}'
+    name: '{pipeline}-networking-generic-switch-dsvm{suffix}'
     node: '{node}'
 
     wrappers:
@@ -49,7 +49,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-networking-generic-switch-dsvm-tempest{job-suffix}'
+    name: '{pipeline}-networking-generic-switch-dsvm-tempest{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-l2gw.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-networking-l2gw-dsvm-functional{job-suffix}'
+    name: '{pipeline}-networking-l2gw-dsvm-functional{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-midonet.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -61,7 +61,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -131,7 +131,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-networking-midonet-v2-rally-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-networking-midonet-v2-rally-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -199,7 +199,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-networking-midonet-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-networking-midonet-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-odl.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -64,7 +64,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-rally-dsvm-networking-odl-{odl-release-base}{job-suffix}'
+    name: '{pipeline}-rally-dsvm-networking-odl-{odl-release-base}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -118,7 +118,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-networking-odl{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-networking-odl{suffix}'
     node: '{node}'
 
     wrappers:
@@ -154,7 +154,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-odl-multinode-{odl-release-base}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-odl-multinode-{odl-release-base}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -221,7 +221,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dsvm-networking-odl-{odltest}-{odl-release-base}{job-suffix}'
+    name: '{pipeline}-dsvm-networking-odl-{odltest}-{odl-release-base}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-ofagent.yaml

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

jenkins/jobs/networking-onos.yaml

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

jenkins/jobs/networking-ovn.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-install-dsvm-networking-ovn-kuryr{job-suffix}'
+    name: '{pipeline}-install-dsvm-networking-ovn-kuryr{suffix}'
     node: '{node}'
 
     wrappers:
@@ -50,7 +50,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-ovn{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-ovn{suffix}'
     node: '{node}'
 
     wrappers:
@@ -109,7 +109,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-ovn-native-services{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-ovn-native-services{suffix}'
     node: '{node}'
 
     wrappers:
@@ -168,7 +168,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-ovn-native-services-multinode{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-ovn-native-services-multinode{suffix}'
     node: '{node}'
 
     wrappers:
@@ -230,7 +230,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-rally-dsvm-networking-ovn{job-suffix}'
+    name: '{pipeline}-rally-dsvm-networking-ovn{suffix}'
     node: '{node}'
 
     wrappers:
@@ -274,7 +274,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-networking-ovn-dsvm-{ovntest}{job-suffix}'
+    name: '{pipeline}-networking-ovn-dsvm-{ovntest}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -322,7 +322,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-networking-ovn-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-networking-ovn-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/networking-sfc.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-networking-sfc-functional-dsvm-{node}{job-suffix}'
+    name: '{pipeline}-networking-sfc-functional-dsvm-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -56,7 +56,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-networking-sfc-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-networking-sfc-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-dynamic-routing.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-dynamic-routing-dsvm-functional{job-suffix}'
+    name: '{pipeline}-neutron-dynamic-routing-dsvm-functional{suffix}'
     node: '{node}'
 
     wrappers:
@@ -46,7 +46,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dynamic-routing-dsvm-tempest{job-suffix}'
+    name: '{pipeline}-neutron-dynamic-routing-dsvm-tempest{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-fwaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}'
+    name: '{pipeline}-neutron-fwaas-dsvm-functional{suffix}'
     node: '{node}'
 
     wrappers:
@@ -45,7 +45,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest{branch-designator}{job-suffix}'
+    name: '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest{branch-designator}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -99,7 +99,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-fwaas-multinode{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-fwaas-multinode{suffix}'
     node: '{node}'
 
     wrappers:
@@ -142,7 +142,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{job-suffix}'
+    name: '{pipeline}-neutron-fwaas-{fwaas-version}-dsvm-tempest-multinode{branch-designator}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-lbaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}-{node}{job-suffix}'
+    name: '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -50,7 +50,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-lbaas-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-neutron-lbaas-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron-vpnaas.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -45,7 +45,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -89,7 +89,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{job-suffix}'
+    name: '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -122,7 +122,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{job-suffix}'
+    name: '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/neutron.yaml

@@ -28,7 +28,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-api{which}-{node}{job-suffix}'
+    name: '{pipeline}-neutron-dsvm-api{which}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -83,7 +83,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -120,7 +120,7 @@
 # with the native configuration. This will happen when stable/mitaka is
 # dropped
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-ovs-native-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-ovs-native-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -161,7 +161,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-ha-multinode-full-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-ha-multinode-full-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -198,7 +198,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-functional{python}-{node}{job-suffix}'
+    name: '{pipeline}-neutron-dsvm-functional{python}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -245,7 +245,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-fullstack-{node}{job-suffix}'
+    name: '{pipeline}-neutron-dsvm-fullstack-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -291,7 +291,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutronclient-test-dsvm-{which-test}-{node}{job-suffix}'
+    name: '{pipeline}-neutronclient-test-dsvm-{which-test}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -336,7 +336,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-ipv6only{suffix}'
     node: '{node}'
 
     wrappers:
@@ -369,7 +369,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-serviceipv6{suffix}'
     node: '{node}'
 
     wrappers:
@@ -405,7 +405,7 @@
 # with the native configuration. This will happen when stable/mitaka is
 # dropped
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-ovs-native-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-ovs-native-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -445,7 +445,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-linuxbridge-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -479,7 +479,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -526,7 +526,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-{which}-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-{which}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -568,7 +568,7 @@
 # 2) oslo.messaging from git
 # 3) specific oslo.messaging driver enabled
 - job-template:
-    name: 'gate-tempest-neutron-dsvm-src-oslo.messaging-{plugin}-{node}{job-suffix}'
+    name: 'gate-tempest-neutron-dsvm-src-oslo.messaging-{plugin}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -603,7 +603,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-scenario-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-scenario-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -650,7 +650,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/nodepool.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-dsvm-nodepool{job-suffix}'
+    name: '{pipeline}-dsvm-nodepool{suffix}'
     node: '{node}'
 
     wrappers:
@@ -55,7 +55,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dsvm-nodepool-src-shade{job-suffix}'
+    name: '{pipeline}-dsvm-nodepool-src-shade{suffix}'
     node: '{node}'
 
     wrappers:
@@ -114,7 +114,7 @@
 
 
 - job-template:
-    name: '{pipeline}-dsvm-nodepool-src-diskimage-builder{job-suffix}'
+    name: '{pipeline}-dsvm-nodepool-src-diskimage-builder{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/nova.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-novaclient-dsvm-functional{special}-{node}{job-suffix}'
+    name: '{pipeline}-novaclient-dsvm-functional{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -48,7 +48,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-placement-full-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-placement-full-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -90,7 +90,7 @@
 # This runs single-node full grenade upgrade with neutron plus cells v2 and
 # the placement-api service.
 - job-template:
-    name: '{pipeline}-grenade-dsvm-neutron-nova-next-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-neutron-nova-next-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/oaktree.yaml

@@ -66,7 +66,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-oaktree-dsvm-functional{job-suffix}'
+    name: '{pipeline}-oaktree-dsvm-functional{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/octavia.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-{node}{job-suffix}'
+    name: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -49,7 +49,7 @@
       - devstack-logs
       - console-log
 - job-template:
-    name: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-multinode{job-suffix}'
+    name: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-multinode{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/openstack-ansible-jobs.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-{name}-openstack-ansible-{scenario}-{node}{job-suffix}'
+    name: 'gate-{name}-openstack-ansible-{scenario}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/openstackid.yaml

@@ -24,7 +24,7 @@
         - console-log
 
 - job-template:
-    name: 'openstackid-release-{job-suffix}'
+    name: 'openstackid-release-{suffix}'
     node: ubuntu-trusty
 
     builders:

jenkins/jobs/osc.yaml

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

jenkins/jobs/oslo.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}-{node}{job-suffix}'
+    name: '{pipeline}-oslo.messaging-dsvm-functional-{version}-{driver}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -34,7 +34,7 @@
 # A Template 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}-{node}{job-suffix}'
+    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/puppet-module-jobs.yaml

@@ -58,7 +58,7 @@
 
 
 - job-template:
-    name: 'gate-{name}-puppet-beaker-rspec-{node}{job-suffix}'
+    name: 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
     node: '{node}'
 
     builders:
@@ -179,7 +179,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-puppet-openstack-integration-{puppet_version}-{scenario}-tempest-{node}{job-suffix}'
+    name: 'gate-puppet-openstack-integration-{puppet_version}-{scenario}-tempest-{node}{suffix}'
     node: '{node}'
 
     builders:
@@ -379,7 +379,7 @@
     node:
       - ubuntu-trusty
     jobs:
-      - 'gate-{name}-puppet-beaker-rspec-{node}{job-suffix}'
+      - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 
 - job-group:
     name: 'puppet-beaker-jobs-xenial'
@@ -387,7 +387,7 @@
     node:
       - ubuntu-xenial
     jobs:
-      - 'gate-{name}-puppet-beaker-rspec-{node}{job-suffix}'
+      - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 
 - job-group:
     name: 'puppet-beaker-jobs-centos7'
@@ -395,7 +395,7 @@
     node:
       - centos-7
     jobs:
-      - 'gate-{name}-puppet-beaker-rspec-{node}{job-suffix}'
+      - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 
 - job-group:
     name: 'puppet-openstack-integration-jobs'
@@ -412,7 +412,7 @@
       - scenario003
       - scenario004
     jobs:
-      - 'gate-puppet-openstack-integration-{puppet_version}-{scenario}-tempest-{node}{job-suffix}'
+      - 'gate-puppet-openstack-integration-{puppet_version}-{scenario}-tempest-{node}{suffix}'
 
 - job-group:
     name: 'puppet-openstack-libraries-jobs'

jenkins/jobs/rally.yaml

@@ -469,7 +469,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-murano-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-murano-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -490,7 +490,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-mistral-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-mistral-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -510,7 +510,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-cue-{broker}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-cue-{broker}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -530,7 +530,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-designate-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-designate-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -551,7 +551,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -582,7 +582,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-neutron-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-neutron-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -673,7 +673,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-fakevirt-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-fakevirt-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -704,7 +704,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-zaqar-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-zaqar-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -811,7 +811,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-certification-with-keystone-{keystone-version}{job-suffix}'
+    name: 'gate-rally-dsvm-certification-with-keystone-{keystone-version}{suffix}'
     node: ubuntu-xenial
 
     wrappers:
@@ -1006,7 +1006,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-monasca-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-monasca-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1054,7 +1054,7 @@
       - console-log
 
 - job-template:
-    name: 'gate-rally-dsvm-senlin-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-senlin-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1085,7 +1085,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-watcher-{name}-{node}{job-suffix}'
+    name: 'gate-rally-dsvm-watcher-{name}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -1116,7 +1116,7 @@
 
 
 - job-template:
-    name: 'gate-rally-dsvm-magnum-{name}{job-suffix}'
+    name: 'gate-rally-dsvm-magnum-{name}{suffix}'
     node: ubuntu-xenial
 
     wrappers:

jenkins/jobs/requirements.yaml

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

jenkins/jobs/sahara.yaml

@@ -134,7 +134,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-cli-{node}{job-suffix}'
+    name: '{pipeline}-{name}-cli-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -179,7 +179,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-sahara-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-sahara-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -226,7 +226,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-sahara-{node}{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-sahara-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -265,7 +265,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-dsvm-scenario-{network}-{node}{job-suffix}'
+    name: '{pipeline}-{name}-dsvm-scenario-{network}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -326,7 +326,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/scalpels.yaml

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

jenkins/jobs/sdk.yaml

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

jenkins/jobs/senlin.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-senlin-dsvm-tempest-{test_type}{job-suffix}'
+    name: '{pipeline}-senlin-dsvm-tempest-{test_type}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/shade.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-keystone2{job-suffix}'
+    name: '{pipeline}-shade-dsvm-functional-keystone2{suffix}'
     node: '{node}'
 
     wrappers:
@@ -40,7 +40,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-neutron{job-suffix}'
+    name: '{pipeline}-shade-dsvm-functional-neutron{suffix}'
     node: '{node}'
 
     wrappers:
@@ -87,7 +87,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-libs{job-suffix}'
+    name: '{pipeline}-shade-dsvm-functional-libs{suffix}'
     node: '{node}'
 
     wrappers:
@@ -146,7 +146,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional-nova{job-suffix}'
+    name: '{pipeline}-shade-dsvm-functional-nova{suffix}'
     node: '{node}'
 
     wrappers:
@@ -187,7 +187,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-ansible{job-suffix}'
+    name: '{pipeline}-shade-dsvm-ansible{suffix}'
     node: '{node}'
 
     wrappers:
@@ -232,7 +232,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-shade-dsvm-ansible-dev{job-suffix}'
+    name: '{pipeline}-shade-dsvm-ansible-dev{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/sqlalchemy-migrate.yaml

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

jenkins/jobs/swift.yaml

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

jenkins/jobs/tacker.yaml

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

jenkins/jobs/tap-as-a-service.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-tap-as-a-service{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-tap-as-a-service{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/tempest-jobs.yaml

@@ -1,19 +1,19 @@
 - job-group:
     name: 'lib-forward-testing-{name}'
     jobs:
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{suffix}':
           pipeline: gate
           node:
             - ubuntu-trusty
             - ubuntu-xenial
-          job-suffix: ''
+          suffix: ''
           branch-override: default
 
 - job-group:
     name: 'stable-compat-jobs-{name}'
     jobs:
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
-          job-suffix: '-newton'
+          suffix: '-newton'
           branch-override: stable/newton

jenkins/jobs/tricircle.yaml

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

jenkins/jobs/tripleo.yaml

@@ -41,7 +41,7 @@
             openstack/tripleo-puppet-elements
 
 - job-template:
-    name: '{pipeline}-tripleo-quickstart-{scenario}-{node}{job-suffix}'
+    name: '{pipeline}-tripleo-quickstart-{scenario}-{node}{suffix}'
     node: '{node}'
 
     builders:
@@ -62,7 +62,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{job-suffix}'
+    name: '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{suffix}'
     node: '{node}'
 
     builders:
@@ -218,8 +218,8 @@
 - job-group:
     name: 'tripleo-quickstart-jobs'
     jobs:
-      - '{pipeline}-tripleo-quickstart-{scenario}-{node}{job-suffix}':
-          job-suffix: '-nv'
+      - '{pipeline}-tripleo-quickstart-{scenario}-{node}{suffix}':
+          suffix: '-nv'
           node:
             - centos-7
           pipeline: gate
@@ -229,8 +229,8 @@
 - job-group:
     name: 'tripleo-quickstart-extras-jobs'
     jobs:
-      - '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{job-suffix}':
-          job-suffix: '-nv'
+      - '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{suffix}':
+          suffix: '-nv'
           node:
             - centos-7
           pipeline: gate

jenkins/jobs/trove.yaml

@@ -1,6 +1,6 @@
 - job-template:
     description: This is a legacy job that relies on trove-integration and will be removed in Queen.
-    name: 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}'
+    name: 'gate-trove-legacy-functional-dsvm-{datastore}{suffix}'
     node: ubuntu-trusty
 
     wrappers:
@@ -49,7 +49,7 @@
 
 - job-template:
     description: This job uses image elements in the trove repository.
-    name: 'gate-trove-functional-dsvm-{datastore}-{node}{job-suffix}'
+    name: 'gate-trove-functional-dsvm-{datastore}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -97,7 +97,7 @@
 
 - job-template:
     description: This is a legacy job that relies on trove-integration and will be removed in Queen.
-    name: 'gate-trove-legacy-scenario-dsvm-{datastore}{job-suffix}'
+    name: 'gate-trove-legacy-scenario-dsvm-{datastore}{suffix}'
     node: ubuntu-trusty
 
     wrappers:
@@ -147,7 +147,7 @@
 
 - job-template:
     description: This job uses image elements in the trove repository.
-    name: 'gate-trove-scenario-dsvm-{datastore}-{group}-{node}{job-suffix}'
+    name: 'gate-trove-scenario-dsvm-{datastore}-{group}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -195,7 +195,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/vitrage.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-vitrage-dsvm-{suite}-{node}{job-suffix}'
+    name: '{pipeline}-vitrage-dsvm-{suite}-{node}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/watcher.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-watcher-dsvm-multinode-{node-release}{job-suffix}'
+    name: '{pipeline}-watcher-dsvm-multinode-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/windmill.yaml

@@ -17,7 +17,7 @@
               git://git.openstack.org openstack/windmill
 
 - job-template:
-    name: '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}'
+    name: '{pipeline}-windmill-{scenario}-{ostype}{suffix}'
     node: '{ostype}'
 
     builders:
@@ -33,8 +33,8 @@
 - job-group:
     name: 'windmill-jobs'
     jobs:
-      - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}':
-          job-suffix: '-nv'
+      - '{pipeline}-windmill-{scenario}-{ostype}{suffix}':
+          suffix: '-nv'
           ostype:
             - centos-7
             - fedora-24
@@ -43,8 +43,8 @@
           pipeline: gate
           scenario:
             - deploy
-      - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}':
-          job-suffix: ''
+      - '{pipeline}-windmill-{scenario}-{ostype}{suffix}':
+          suffix: ''
           ostype:
             - ubuntu-trusty
             - ubuntu-xenial

jenkins/jobs/zaqar.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-zaqarclient-dsvm-functional-{node}{job-suffix}'
+    name: '{pipeline}-zaqarclient-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -47,7 +47,7 @@
 
 
 - job-template:
-    name: '{pipeline}-dsvm-{backend}-zaqar-{node}{job-suffix}'
+    name: '{pipeline}-dsvm-{backend}-zaqar-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -91,7 +91,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-{backend}-zaqar-{node}{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-{backend}-zaqar-{node}{suffix}'
     node: '{node}'
 
     wrappers: