From bc644fddeba18cfda2cda89b47cb5510877b4122 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Sat, 15 Feb 2014 00:49:51 +0400
Subject: [PATCH] Make main savanna dg job 'full'

We're planning to add CLI and scenarios test to Tempest, so, we should
be able to see jobs running them.

It's partially reverts Ia4cd9106033fbfada5f0cbf8c38d07d0e915edb0

Change-Id: I9473a57e1ca8df119312bd2e3725736c5b00d288
---
 .../jenkins_job_builder/config/devstack-gate.yaml    |  9 +++++----
 .../files/jenkins_job_builder/config/projects.yaml   |  2 +-
 modules/openstack_project/files/zuul/layout.yaml     | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index ed256f56bf..7338eff032 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -778,12 +778,12 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-savanna{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
     node: '{node}'
 
     wrappers:
       - timeout:
-          timeout: 125
+          timeout: 185
           fail: true
       - timestamps
 
@@ -792,8 +792,9 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TIMEOUT=180
           export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_SAVANNA=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -1066,7 +1067,7 @@
       - '{pipeline}-grenade-dsvm-forward'
       - '{pipeline}-grenade-dsvm-neutron'
       - '{pipeline}-grenade-dsvm-neutron-forward'
-      - '{pipeline}-tempest-dsvm-savanna{branch-designator}'
+      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
       - '{pipeline}-devstack-dsvm-neutron{branch-designator}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index ba48eb5cdc..0e4cfb0da0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -193,7 +193,7 @@
       - pypi-jobs
       - translation-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-savanna{branch-designator}':
+      - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: '-nv'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 621262a1a4..afaff420e9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -449,7 +449,7 @@ jobs:
     voting: false
   - name: gate-savanna-pylint
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-savanna-nv$
+  - name: ^(gate|check)-tempest-dsvm-savanna-full-nv$
     voting: false
   - name: ^(gate|check)-tempest-dsvm-savanna-postgres-nv$
     voting: false
@@ -962,12 +962,12 @@ projects:
     check:
       - gate-savanna-pylint
       - gate-savanna-requirements
-      - check-tempest-dsvm-savanna
+      - check-tempest-dsvm-savanna-full
       - check-tempest-dsvm-savanna-postgres
       - check-tempest-dsvm-savanna-neutron
     gate:
       - gate-savanna-requirements
-      - gate-tempest-dsvm-savanna
+      - gate-tempest-dsvm-savanna-full
       - gate-tempest-dsvm-savanna-postgres
       - gate-tempest-dsvm-savanna-neutron
     post:
@@ -2089,7 +2089,7 @@ projects:
       - check-grenade-dsvm
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-nv
+      - check-tempest-dsvm-savanna-full-nv
       - check-tempest-dsvm-savanna-postgres-nv
       - check-tempest-dsvm-savanna-neutron-nv
       - check-tempest-dsvm-neutron-heat-slow
@@ -2328,7 +2328,7 @@ projects:
       - check-devstack-dsvm-neutron
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-nv
+      - check-tempest-dsvm-savanna-full-nv
       - check-tempest-dsvm-savanna-postgres-nv
       - check-tempest-dsvm-savanna-neutron-nv
     gate:
@@ -2518,7 +2518,7 @@ projects:
       - check-devstack-dsvm-cells-havana
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
-      - check-tempest-dsvm-savanna-nv
+      - check-tempest-dsvm-savanna-full-nv
       - check-tempest-dsvm-savanna-postgres-nv
       - check-tempest-dsvm-savanna-neutron-nv
     gate: