Update Barbican Gate to use new Devstack config

This will merge the experimental new-plugin job into the existing gate
job, removing the experimental job in the process as it was only for
testing these changes.

Change-Id: I39c9877a2e6dcb8b08c92f9ac51294ffb0d2f1db
Depends-On: I0ec63819b3aae21a6ffaed5cf8285e26dce6ae94

jenkins/jobs/barbican.yaml

@@ -79,7 +79,7 @@
       - console-log
 
 - job:
-    name: gate-barbican-devstack-dsvm-new-plugin
+    name: gate-barbican-devstack-dsvm-new
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
@@ -116,3 +116,42 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job:
+    name: gate-barbican-dogtag-devstack-dsvm-f21-new
+    node: 'devstack-f21'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export ENABLED_SERVICES=barbican-dogtag,tempest,keystone
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+
+          function gate_hook {
+              $BASE/new/barbican/devstack/gate_hook.sh
+          }
+          export -f gate_hook
+
+          function post_test_hook {
+              cd /opt/stack/new/barbican/functionaltests
+              ./post_test_hook.sh
+          }
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log

zuul/layout.yaml

@@ -1044,10 +1044,13 @@ jobs:
   - name: manila-coverage
     voting: false
 
+  - name: gate-barbican-devstack-dsvm-new
+    voting: false
+
   - name: gate-barbican-dogtag-devstack-dsvm-f21
     voting: false
 
-  - name: gate-barbican-devstack-dsvm-new-plugin
+  - name: gate-barbican-dogtag-devstack-dsvm-f21-new
     voting: false
 
   - name: gate-barbican-tox-bandit
@@ -1728,13 +1731,14 @@ projects:
       - name: check-requirements
     check:
       - gate-barbican-devstack-dsvm
+      - gate-barbican-devstack-dsvm-new
       - barbican-coverage
       - gate-barbican-tox-bandit
       - gate-barbican-dogtag-devstack-dsvm-f21
+      - gate-barbican-dogtag-devstack-dsvm-f21-new
     gate:
       - gate-barbican-devstack-dsvm
-    experimental:
-      - gate-barbican-devstack-dsvm-new-plugin
+      - gate-barbican-devstack-dsvm-new
 
   - name: openstack/barbican-specs
     template: