Merge "Migrated sahara-client-functional-job"

jenkins/jobs/projects.yaml

@@ -8105,11 +8105,6 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-saharaclient-dsvm-functional{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
 
 - project:
     name: python-scciclient

jenkins/jobs/sahara.yaml

@@ -128,9 +128,9 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-saharaclient-dsvm-functional{job-suffix}'
-    node: '{node}'
+- job:
+    name: 'gate-sahara-cli-nv'
+    node: ubuntu-trusty
 
     wrappers:
       - build-timeout:
@@ -145,18 +145,15 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
-          export BRANCH_OVERRIDE={branch-override}
-          export PROJECTS="openstack/python-saharaclient $PROJECTS"
+          export PROJECTS="openstack/sahara-tests $PROJECTS"
           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
-          }}
+          function post_test_hook {
+              cd /opt/stack/new/sahara-tests/tools/gate/cli_tests
+              ./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
 

zuul/layout.yaml

@@ -2887,8 +2887,19 @@ jobs:
     branch: ^(?!stable/kilo).*$
 
   # Saharaclient functional test don't run on kilo or earlier
-  - name: ^gate-saharaclient-dsvm-functional$
+  - name: ^gate-sahara-cli-nv$
     branch: ^(?!stable/kilo).*$
+    skip-if:
+      - project: ^openstack/sahara-tests$
+        all-files-match-any:
+          - ^.*\.rst$
+          - ^doc/.*$
+          - ^releasenotes/.*$
+          - ^etc/.*$
+          - ^sahara_tests/.*$
+          - ^sahara_tempest_plugin/.*$
+          - ^tools/.*$
+          - ^tox.ini$
 
   # Only run the unit cross tests for cliff against master.
   - name: ^gate-cliff-tox-(openstackclient|neutronclient)-tip$
@@ -11056,9 +11067,7 @@ projects:
       - name: osc-plugin-jobs
     check:
       - gate-python-saharaclient-python34
-      - gate-saharaclient-dsvm-functional
-    gate:
-      - gate-saharaclient-dsvm-functional
+      - gate-sahara-cli-nv
     post:
       - python-saharaclient-coverage
     experimental:
@@ -11593,6 +11602,7 @@ projects:
       - gate-tempest-dsvm-sahara-nv
       - gate-sahara-tests-dsvm-scenario-neutron-heat
       - gate-sahara-tests-dsvm-scenario-nova-heat
+      - gate-sahara-cli-nv
     gate:
       - gate-sahara-tests-dsvm-scenario-neutron-heat
       - gate-sahara-tests-dsvm-scenario-nova-heat