Merge "[sahara] Drop tests for direct engine"

jenkins/jobs/projects.yaml

@@ -12871,13 +12871,12 @@
       - pypi-jobs
       - openstack-client-publish-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
+      - '{pipeline}-{name}-dsvm-scenario-{network}{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
@@ -13488,34 +13487,18 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
+      - '{pipeline}-{name}-dsvm-scenario-{network}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
           network: neutron
-          engine: heat
+      - '{pipeline}-{name}-dsvm-scenario-{network}{job-suffix}':
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
           network: nova
-          engine: heat
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-          network: neutron
-          engine: direct
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-          network: nova
-          engine: direct
       - api-ref-jobs:
           service: data-processing
 
@@ -13602,20 +13585,18 @@
       - python-jobs
       - gate-{name}-pylint
       - openstack-releasenotes-jobs
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
+      - '{pipeline}-{name}-dsvm-scenario-{network}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
           network: neutron
-          engine: heat
+      - '{pipeline}-{name}-dsvm-scenario-{network}{job-suffix}':
-      - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
           network: nova
-          engine: heat
 
 - project:
     name: salt-formula-ceilometer

jenkins/jobs/sahara.yaml

@@ -282,7 +282,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}'
+    name: '{pipeline}-{name}-dsvm-scenario-{network}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -322,19 +322,15 @@
               export DEVSTACK_GATE_NEUTRON=1
           fi
 
-          if [ "{engine}" == "heat" ] ; then
-              export DEVSTACK_GATE_HEAT=1
-          fi
-
           function pre_test_hook {{
               cd /opt/stack/new/sahara-tests/tools/gate/scenario
-              ./pre_test_hook.sh {network} {engine}
+              ./pre_test_hook.sh {network}
           }}
           export -f pre_test_hook
 
           function post_test_hook {{
               cd /opt/stack/new/sahara-tests/tools/gate/scenario
-              ./post_test_hook.sh {network} {engine}
+              ./post_test_hook.sh {network}
           }}
           export -f post_test_hook
 

zuul/layout.yaml

@@ -2655,10 +2655,6 @@ jobs:
   - name: gate-neutron-lbaas-dashboard-dsvm-integration
     voting: false
 
-  # direct engine only in stable/liberty
-  - name: ^gate-sahara-dsvm-scenario.*-direct$
-    branch: ^stable/liberty$
-
   - name: gate-sahara-tests-pylint
     voting: false
 
@@ -15563,7 +15559,7 @@ projects:
     check:
       - gate-python-saharaclient-python34
       - gate-sahara-cli-nv
-      - gate-python-saharaclient-dsvm-scenario-neutron-heat-nv
+      - gate-python-saharaclient-dsvm-scenario-neutron-nv
     post:
       - python-saharaclient-coverage-ubuntu-trusty
       - python-saharaclient-coverage-ubuntu-xenial
@@ -16115,15 +16111,11 @@ projects:
       - sahara-coverage-db-ubuntu-trusty
       - sahara-coverage-db-ubuntu-xenial
       - gate-grenade-dsvm-sahara
-      - gate-sahara-dsvm-scenario-neutron-heat
+      - gate-sahara-dsvm-scenario-neutron
-      - gate-sahara-dsvm-scenario-nova-heat
+      - gate-sahara-dsvm-scenario-nova
-      - gate-sahara-dsvm-scenario-neutron-direct
-      - gate-sahara-dsvm-scenario-nova-direct
     gate:
-      - gate-sahara-dsvm-scenario-neutron-heat
+      - gate-sahara-dsvm-scenario-neutron
-      - gate-sahara-dsvm-scenario-nova-heat
+      - gate-sahara-dsvm-scenario-nova
-      - gate-sahara-dsvm-scenario-neutron-direct
-      - gate-sahara-dsvm-scenario-nova-direct
       - gate-tempest-dsvm-sahara
     post:
       - sahara-coverage-db-ubuntu-trusty
@@ -16229,14 +16221,14 @@ projects:
     check:
       - gate-sahara-tests-pylint
       - gate-tempest-dsvm-sahara-nv
-      - gate-sahara-tests-dsvm-scenario-neutron-heat
+      - gate-sahara-tests-dsvm-scenario-neutron
-      - gate-sahara-tests-dsvm-scenario-nova-heat
+      - gate-sahara-tests-dsvm-scenario-nova
       - gate-sahara-cli-nv
       - sahara-tests-coverage-ubuntu-trusty
       - sahara-tests-coverage-ubuntu-xenial
     gate:
-      - gate-sahara-tests-dsvm-scenario-neutron-heat
+      - gate-sahara-tests-dsvm-scenario-neutron
-      - gate-sahara-tests-dsvm-scenario-nova-heat
+      - gate-sahara-tests-dsvm-scenario-nova
     post:
       - sahara-tests-coverage-ubuntu-trusty
       - sahara-tests-coverage-ubuntu-xenial