Merge "Add a heat job to use devstack plugin"

jenkins/jobs/heat.yaml

@@ -304,3 +304,36 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-heat-dsvm-dsplugin{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell : |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="orchestration"
+          export DEVSTACK_GATE_HEAT=1
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          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/projects.yaml

@@ -2474,6 +2474,11 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
+      - '{pipeline}-heat-dsvm-dsplugin{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
       - python-liberty-bitrot-db-jobs
       - python-mitaka-bitrot-db-jobs
       - openstack-publish-jobs

zuul/layout.yaml

@@ -6797,6 +6797,7 @@ projects:
       - gate-heat-dsvm-functional-orig-mysql-lbaasv1-identity-v3-only-nv
       - gate-rally-dsvm-fakevirt-heat
       - gate-heat-dsvm-functional-orig-postgres-lbaasv1
+      - gate-heat-dsvm-dsplugin
 
   - name: openstack/heat-cfntools
     template: