Merge "add devstack up/down test"

jenkins/jobs/devstack-gate.yaml

@@ -582,6 +582,42 @@
       - devstack-logs
       - console-log
 
+# dsvm-updown builds up an devstack and shuts it down, this ensures
+# that things like unstack.sh and clean.sh work correctly. This should
+# only be run on the devstack tree.
+- job-template:
+    name: '{pipeline}-devstack-dsvm-updown{branch-designator}'
+    node: '{node}'
+
+    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 BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          # ensure that the unstack.sh and clean.sh scripts run
+          # without errors, so that we can
+          function post_test_hook {{
+              cd /opt/stack/new/devstack
+              ./unstack.sh
+              ./clean.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
+
 - job-template:
     name: '{pipeline}-devstack-dsvm-cells{branch-designator}'
     node: '{node}'
@@ -1786,6 +1822,7 @@
       - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
       - '{pipeline}-devstack-dsvm-cells{branch-designator}'
+      - '{pipeline}-devstack-dsvm-updown{branch-designator}'
       - '{pipeline}-tempest-dsvm-cells{branch-designator}'
       - '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
       - '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'

zuul/layout.yaml

@@ -592,6 +592,8 @@ jobs:
     voting: false
   - name: check-tempest-dsvm-cells
     voting: false
+  - name: check-devstack-dsvm-updown
+    voting: false
   - name: check-tempest-dsvm-f20
     branch: ^(?!stable)
     voting: false
@@ -2924,6 +2926,7 @@ projects:
       - check-neutron-dsvm-functional
       - check-swift-dsvm-functional
       - check-tempest-dsvm-ironic-pxe_ssh
+      - check-devstack-dsvm-updown
       - check-tempest-dsvm-f21
       - check-tempest-dsvm-centos7
       - gate-devstack-publish-docs