Merge "Add Job for marconi-tempest integration"

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

@@ -410,6 +410,38 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-marconi{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 125
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_MARCONI=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-template:
     name: '{pipeline}-tempest-dsvm-cells{branch-designator}'
     node: '{node}'
@@ -1031,6 +1063,7 @@
       - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
+      - '{pipeline}-tempest-dsvm-marconi{branch-designator}'
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
       - '{pipeline}-tempest-dsvm-stress{branch-designator}'

modules/openstack_project/files/zuul/layout.yaml

@@ -420,6 +420,8 @@ jobs:
     voting: false
   - name: gate-marconi-python33
     voting: false
+  - name: ^(gate|check)-tempest-dsvm-marconi
+    voting: false
   - name: gate-python-ceilometerclient-python33
     voting: false
   - name: gate-python-glanceclient-python33
@@ -754,6 +756,7 @@ projects:
 # TODO: add docs
   - name: openstack/marconi
     check:
+      - check-tempest-dsvm-marconi
       - gate-marconi-requirements
       - gate-marconi-pep8
       - gate-marconi-python26
@@ -1935,6 +1938,7 @@ projects:
       - gate-tempest-dsvm-savanna-postgres-full
       - gate-tempest-dsvm-savanna-neutron
       - gate-tempest-dsvm-trove-full
+      - check-tempest-dsvm-marconi
       - check-tempest-dsvm-neutron-isolated
       - check-tempest-dsvm-neutron-pg-isolated
     post: