[sahara] scenario jobs refactoring

* scenario jobs in liberty are stable and working,
enabling voting
* adding non-voting job scenario for saharaclient
* enable localrc changes from the tempest test.

Change-Id: I7764dedfa3c2bdc1f9920f7a4e099f63d79b0237

jenkins/jobs/projects.yaml

@@ -11365,6 +11365,13 @@
       - pypi-jobs
       - openstack-client-publish-jobs
       - openstack-releasenotes-jobs
+      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
+          network: neutron
+          engine: heat
       - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
@@ -11949,28 +11956,14 @@
       - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
-          job-suffix: '-nv'
+          job-suffix: ''
-          branch-override: default
-          network: neutron
-          engine: heat
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: '-nv'
-          branch-override: default
-          network: nova
-          engine: heat
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: '-nv'
           branch-override: default
           network: neutron
           engine: direct
       - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
-          job-suffix: '-nv'
+          job-suffix: ''
           branch-override: default
           network: nova
           engine: direct

jenkins/jobs/sahara.yaml

@@ -182,6 +182,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
+          export KEEP_LOCALRC=1
           export DEVSTACK_GATE_TEMPEST_REGEX="(sahara_tempest_plugin.tests.api|sahara_tempest_plugin.tests.clients|data_processing)"
           export DEVSTACK_LOCAL_CONFIG="export TEMPEST_PLUGINS='/opt/stack/new/sahara-tests'"
           export PROJECTS="openstack/sahara-tests $PROJECTS"
@@ -278,6 +279,11 @@
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/sahara-tests $PROJECTS"
 
+          if [ "{name}" == "python-saharaclient" ] ; then
+              export PROJECTS="openstack/python-saharaclient $PROJECTS"
+              export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
+          fi
+
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

zuul/layout.yaml

@@ -2420,10 +2420,8 @@ jobs:
   - name: gate-neutron-lbaas-dashboard-dsvm-integration
     voting: false
 
-  - name: ^gate-sahara-dsvm-scenario.*-heat$
+  # direct engine only in stable/liberty
-    branch: ^(?!stable/liberty).*$
+  - name: ^gate-sahara-dsvm-scenario.*-direct$
-
-  - name: ^gate-sahara-dsvm-scenario.*-nv$
     branch: ^stable/liberty$
 
   - name: gate-sahara-tests-pylint
@@ -14012,6 +14010,7 @@ projects:
     check:
       - gate-python-saharaclient-python34
       - gate-sahara-cli-nv
+      - gate-python-saharaclient-dsvm-scenario-neutron-heat-nv
     post:
       - python-saharaclient-coverage-ubuntu-trusty
       - python-saharaclient-coverage-ubuntu-xenial
@@ -14535,13 +14534,13 @@ projects:
       - gate-grenade-dsvm-sahara
       - gate-sahara-dsvm-scenario-neutron-heat
       - gate-sahara-dsvm-scenario-nova-heat
-      - gate-sahara-dsvm-scenario-neutron-heat-nv
+      - gate-sahara-dsvm-scenario-neutron-direct
-      - gate-sahara-dsvm-scenario-nova-heat-nv
+      - gate-sahara-dsvm-scenario-nova-direct
-      - gate-sahara-dsvm-scenario-neutron-direct-nv
-      - gate-sahara-dsvm-scenario-nova-direct-nv
     gate:
       - gate-sahara-dsvm-scenario-neutron-heat
       - gate-sahara-dsvm-scenario-nova-heat
+      - gate-sahara-dsvm-scenario-neutron-direct
+      - gate-sahara-dsvm-scenario-nova-direct
       - gate-tempest-dsvm-sahara
     post:
       - sahara-coverage-db-ubuntu-trusty