Merge "Update devstack-gate jobs for Trove tempest tests"

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -967,6 +967,38 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-trove-full{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 95
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=90
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_TROVE=1
+          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
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-group:
     name: devstack-gate-jobs
     jobs:
@@ -1006,3 +1038,4 @@
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
       - '{pipeline}-tempest-dsvm-stress{branch-designator}'
+      - '{pipeline}-tempest-dsvm-trove-full{branch-designator}'

modules/openstack_project/files/zuul/layout.yaml

@@ -409,6 +409,8 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-savanna-neutron$
     voting: false
+  - name: ^(gate|check)-tempest-dsvm-trove-full$
+    voting: false
   - name: gate-marconi-python33
     voting: false
   - name: gate-python-ceilometerclient-python33
@@ -902,8 +904,10 @@ projects:
       - name: openstack-server-publish-jobs
     check:
       - gate-trove-requirements
+      - check-tempest-dsvm-trove-full
     gate:
       - gate-trove-requirements
+      - gate-tempest-dsvm-trove-full
     pre-release:
       - trove-tarball
     release:
@@ -1872,6 +1876,7 @@ projects:
       - gate-tempest-dsvm-savanna-full
       - gate-tempest-dsvm-savanna-postgres-full
       - gate-tempest-dsvm-savanna-neutron
+      - gate-tempest-dsvm-trove-full
       - check-tempest-dsvm-ironic
       - check-tempest-dsvm-ironic-postgres
       - check-tempest-dsvm-neutron-isolated