Add non-voting diskimage-builder jobs

This commit allows the definition of non-voting gate jobs by defining
a new job-suffix. 'extras' was added as a new job pre-suffix because
just 'nv' implies we would be testing the same things as the
non-postfixed variant.  This was done to facilitate adding a Gentoo
non-voting gate job, also in this commit.

Change-Id: I08f35397a4cce05b90d88077922dc38ece5c2b55
Depends-On: I0d2768a912b350e1b2cf40d2fd227fdc767b1bcb
Signed-off-by: Matthew Thode <mthode@mthode.org>

jenkins/jobs/diskimage-builder.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-dib-dsvm-functests-{node}'
+    name: 'gate-dib-dsvm-functests-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -29,7 +29,7 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh
+          ./openstack/diskimage-builder/tests/run_functests.sh {tests}
           set +u
           deactivate
           set -u

jenkins/jobs/projects.yaml

@@ -1359,10 +1359,22 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - gate-dib-dsvm-functests-{node}:
+      - gate-dib-dsvm-functests-{node}{job-suffix}:
           node: ubuntu-trusty
-      - gate-dib-dsvm-functests-{node}:
+          job-suffix: '-extras-nv'
+          tests: 'gentoo/build-succeeds'
+      - gate-dib-dsvm-functests-{node}{job-suffix}:
           node: devstack-centos7
+          job-suffix: '-extras-nv'
+          tests: 'gentoo/build-succeeds'
+      - gate-dib-dsvm-functests-{node}{job-suffix}:
+          node: ubuntu-trusty
+          job-suffix: ''
+          tests: ''
+      - gate-dib-dsvm-functests-{node}{job-suffix}:
+          node: devstack-centos7
+          job-suffix: ''
+          tests: ''
       - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty

zuul/layout.yaml

@@ -5163,6 +5163,8 @@ projects:
     check:
       - gate-dib-dsvm-functests-ubuntu-trusty
       - gate-dib-dsvm-functests-devstack-centos7
+      - gate-dib-dsvm-functests-ubuntu-trusty-extras-nv
+      - gate-dib-dsvm-functests-devstack-centos7-extras-nv
       - gate-tempest-dsvm-ironic-pxe_ssh-dib
     check-tripleo:
       - gate-tripleo-ci-f22-nonha