From 98c890411fdc321e95f124f99b68fb17c2d5bb38 Mon Sep 17 00:00:00 2001
From: Alina Nesterova <zemuvier@gmail.com>
Date: Tue, 14 Jun 2016 17:55:09 +0300
Subject: [PATCH] Migrated sahara-client-functional-job

Tests were moved from saharaclient repo to sahara-tests repo

Co-Authored-By: Evgeny Sikachev <esikachev@mirantis.com>

Change-Id: I52617d5d11c2088dbd6394b44653adf9ff82ad73
---
 jenkins/jobs/projects.yaml |  5 -----
 jenkins/jobs/sahara.yaml   | 21 +++++++++------------
 zuul/layout.yaml           | 18 ++++++++++++++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index fcf1a944d6..23f68261e1 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8006,11 +8006,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
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 5ac6ba08b1..226cb760f4 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -128,9 +128,9 @@
       - sahara-extra-publish
 
 
-- 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
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ec2b553261..45f812eacf 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2761,8 +2761,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$
@@ -10854,9 +10865,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:
@@ -11372,6 +11381,7 @@ projects:
       - gate-sahara-tests-pylint
       - 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