Merge "Add functional test job for python-saharaclient"

jenkins/jobs/projects.yaml

@@ -993,6 +993,12 @@
       - openstack-publish-jobs
       - 'stable-compat-jobs-{name}'
       - 'lib-forward-testing-{name}'
+      - '{pipeline}-saharaclient-dsvm-functional{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+
 
 - project:
     name: python-swiftclient

jenkins/jobs/sahara.yaml

@@ -20,3 +20,41 @@
 
     publishers:
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-saharaclient-dsvm-functional{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 DEVSTACK_GATE_SAHARA=1
+          export BRANCH_OVERRIDE={branch-override}
+          export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {{
+              # Configure and run functional tests
+              $BASE/new/python-saharaclient/saharaclient/tests/functional/hooks/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:
+      - test-results
+      - devstack-logs

zuul/layout.yaml

@@ -1035,6 +1035,8 @@ jobs:
     branch: ^stable/(icehouse|juno)$
   - name: gate-sahara-python26
     branch: ^stable/(icehouse|juno)$
+  - name: ^(gate|check)-saharaclient-dsvm-functional$
+    voting: false
   # sahara-dashboard has only an Icehouse branch
   - name: gate-sahara-dashboard-python26
     branch: ^stable/icehouse$
@@ -2110,6 +2112,7 @@ projects:
     post:
       - python-saharaclient-coverage
     experimental:
+       - check-saharaclient-dsvm-functional
        - gate-python-saharaclient-python34
        - gate-python-saharaclient-pypy