Merge python-barbicanclient.yaml into barbican.yaml

No need for an extra file per repo, we normally have one per project.
In this case each file has exactly one job, so let's clean up.

Change-Id: Ia56096bf5aa3ce66956e7246890b9cbb6f8479e5

jenkins/jobs/barbican.yaml

@@ -41,3 +41,42 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: 'gate-python-barbicanclient-devstack-dsvm-{node}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 70
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export ENABLED_SERVICES=barbican,tempest,keystone
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
+
+          function gate_hook {{
+              $BASE/new/barbican/devstack/gate_hook.sh
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              cd /opt/stack/new/python-barbicanclient/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

jenkins/jobs/python-barbicanclient.yaml

@@ -1,38 +0,0 @@
-- job-template:
-    name: 'gate-python-barbicanclient-devstack-dsvm-{node}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export ENABLED_SERVICES=barbican,tempest,keystone
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
-
-          function gate_hook {{
-              $BASE/new/barbican/devstack/gate_hook.sh
-          }}
-          export -f gate_hook
-
-          function post_test_hook {{
-              cd /opt/stack/new/python-barbicanclient/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