From 2d28911daaa78d8f5ddc30ec6c8ce1967d561a8e Mon Sep 17 00:00:00 2001
From: Vitaly Gridnev <vgridnev@mirantis.com>
Date: Tue, 6 Jun 2017 17:30:33 +0400
Subject: [PATCH] [sahara] introduce py3 scenario jobs

this change brings new jobs to test py3 support.

Change-Id: Ibaabe386891c3f99dd47e6868a15a780fdd2bf2d
---
 jenkins/jobs/projects.yaml |  5 +++++
 jenkins/jobs/sahara.yaml   | 29 +++++++++++++++++++++++++++++
 zuul/layout.yaml           |  4 ++++
 3 files changed, 38 insertions(+)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index c9ed5bb351..696eb03276 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -13824,6 +13824,11 @@
           node: ubuntu-xenial
           suffix: '-nv'
           branch-override: default
+      - '{pipeline}-sahara-dsvm-scenario-py3-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: '-nv'
+          branch-override: default
       - '{pipeline}-sahara-dsvm-scenario-{network}-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 6c25f2db24..df2d107994 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -33,6 +33,9 @@
           if [ "{sahara-mod-wsgi}" -eq 1 ] ; then
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"SAHARA_USE_MOD_WSGI=True"
           fi
+          if  [ "{sahara-use-py3}" -eq 1 ] ; then
+              export DEVSTACK_GATE_USE_PYTHON3=True
+          fi
           export BRANCH_OVERRIDE={branch-override}
           if [ "{branch-override}" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -344,6 +347,7 @@
     builders:
       - devstack-sahara:
           network: "{network}"
+          sahara-use-py3: 0
           multinode: 0
           sahara-mod-wsgi: 0
           plugin: "fake"
@@ -366,6 +370,7 @@
     builders:
       - devstack-sahara:
           network: neutron
+          sahara-use-py3: 0
           multinode: 0
           sahara-mod-wsgi: 1
           plugin: fake
@@ -376,6 +381,29 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-sahara-dsvm-scenario-py3-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - devstack-sahara:
+          network: neutron
+          sahara-use-py3: 1
+          multinode: 0
+          sahara-mod-wsgi: 0
+          plugin: fake
+          branch-override: "{branch-override}"
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-sahara-dsvm-scenario-multinode-{plugin}-{node-release}{suffix}'
     node: '{node}'
@@ -388,6 +416,7 @@
     builders:
       - devstack-sahara:
           network: neutron
+          sahara-use-py3: 0
           multinode: 1
           sahara-mod-wsgi: 0
           plugin: "{plugin}"
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 6759eb301f..bf536c8e43 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2962,6 +2962,9 @@ jobs:
   - name: ^gate-sahara-dsvm-scenario-multinode-spark-ubuntu-xenial-nv$
     branch: ^(?!stable/(mitaka|newton|ocata)).*$
 
+  - name: ^gate-sahara-dsvm-scenario-py3-ubuntu-xenial-nv$
+    branch: ^(?!stable/(mitaka|newton|ocata)).*$
+
   - name: ^gate-sahara-dsvm-scenario-mod-wsgi-ubuntu-xenial-nv$
     branch: ^(?!stable/(mitaka|newton|ocata)).*$
 
@@ -17298,6 +17301,7 @@ projects:
       - gate-sahara-dsvm-scenario-multinode-spark-ubuntu-xenial-nv
       - gate-sahara-buildimages-cloudera-centos-7-nv
       - gate-sahara-buildimages-ambari-centos-7-nv
+      - gate-sahara-dsvm-scenario-py3-ubuntu-xenial-nv
 
   - name: openstack/sahara-ci-config
     template: