From 127ad834d756576291ba1aa008af7c4cf4ff98f7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 4 Aug 2014 16:06:41 -0700
Subject: [PATCH] Use new d-g GRENADE flags in jenkins jobs.

Devstack gate is growing a new way of setting up Grenade jobs in
I4f102e27b422a5260cd0d5e40e00a5addf87911a. That change is mostly
backward compatible, but we should switch to the new way of doing
things. Do that in this change.

Essentially instead of setting many boolean flags set a single flag with
specific values to get what we want.

Change-Id: Idcfcc80c3bc222e5d540f792bdecb2b297afcd49
---
 .../jenkins_job_builder/config/devstack-gate.yaml   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 265b724713..338462f912 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
@@ -1011,7 +1011,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_GRENADE=pullup
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -1042,8 +1042,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=1
-          export DEVSTACK_GATE_GRENADE_FORWARD=1
+          export DEVSTACK_GATE_GRENADE=forward
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -1074,7 +1073,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_GRENADE=pullup
           export DEVSTACK_GATE_NEUTRON=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -1106,9 +1105,8 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_GRENADE=forward
           export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_GRENADE_FORWARD=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -1139,8 +1137,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=1
-          export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=1
+          export DEVSTACK_GATE_GRENADE=partial-ncpu
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE