From 62bc6c087bb090789e38991c0e7b3fdd38492e9e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Mon, 17 Aug 2015 00:23:13 +0300
Subject: [PATCH] Add experimental scenario dsvm jobs for Sahara

It will be running bunch of scenario tests for Sahara for all
combinations of network and engine to fully test how the
provisioning part of Sahara works.

Hook scripts in Sahara: Ibfd787247bf04b3c75d7341c3fecd6a5c5621e0d

Change-Id: I51854bd25e2b69704448829af4dcbd42b93fcf85
---
 jenkins/jobs/projects.yaml | 29 ++++++++++++++++++++-
 jenkins/jobs/sahara.yaml   | 52 ++++++++++++++++++++++++++++++++++++++
 zuul/layout.yaml           |  9 +++++++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5e77038a6a..528290a94a 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1091,7 +1091,34 @@
           node: 'devstack-trusty'
           branch-designator: ''
           branch-override: default
-
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+          network: neutron
+          engine: heat
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+          network: nova
+          engine: heat
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+          network: neutron
+          engine: direct
+      - '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+          network: nova
+          engine: direct
 
 
 - project:
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 8439b71996..3335ee8015 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -184,3 +184,55 @@
     publishers:
       - devstack-logs
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-sahara-dsvm-scenario-{network}-{engine}{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export KEEP_LOCALRC=1
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          if [ "{network}" == "neutron" ] ; then
+              export DEVSTACK_GATE_NEUTRON=1
+          fi
+
+          function pre_test_hook {{
+              cd /opt/stack/new/sahara/tools/gate/scenario
+              ./pre_test_hook.sh {network} {engine}
+          }}
+          export -f pre_test_hook
+
+          function post_test_hook {{
+              cd /opt/stack/new/sahara/tools/gate/scenario
+              ./post_test_hook.sh {network} {engine}
+          }}
+          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:
+      - devstack-logs
+      - console-log
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dec39913a0..c076e055f1 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1076,6 +1076,10 @@ jobs:
     branch: ^(?!stable/(icehouse|juno|kilo)).*$
     voting: false
 
+  - name: ^gate-sahara-dsvm-scenario.*$
+    branch: ^(?!stable/(icehouse|juno|kilo)).*$
+    voting: false
+
   - name: gate-kite-python34
     voting: false
 
@@ -2757,6 +2761,11 @@ projects:
       - gate-sahara-tox-py27-scenario-unit
     post:
       - sahara-coverage
+    experimental:
+      - gate-sahara-dsvm-scenario-neutron-heat
+      - gate-sahara-dsvm-scenario-nova-heat
+      - gate-sahara-dsvm-scenario-neutron-direct
+      - gate-sahara-dsvm-scenario-nova-direct
 
   - name: openstack/sahara-specs
     template: