From 5cbb0b4343807e9399e5161e8a547cf31308d931 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 15 May 2013 13:18:58 +1200 Subject: [PATCH] DEVSTACK_GATE_HEAT conditional for enabling heat Disabled by default, will need to be enabled for heat tempest tests Change-Id: Id1e18c8c26b7791fd8d82fc5adaf2f9e7713abd4 --- devstack-vm-gate-dev.sh | 1 + devstack-vm-gate-wrap.sh | 4 ++++ devstack-vm-gate.sh | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/devstack-vm-gate-dev.sh b/devstack-vm-gate-dev.sh index fdb08a62..88b3fe16 100755 --- a/devstack-vm-gate-dev.sh +++ b/devstack-vm-gate-dev.sh @@ -19,6 +19,7 @@ export GERRIT_PATCHSET_NUMBER=1 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0} export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0} export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0} +export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0} export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-""} EOF diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 44b8bc69..d55f1fa4 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -43,6 +43,10 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0} # Only applicable to master branch export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0} +# Set to 1 to run heat +# Only applicable to master branch +export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0} + # Set to 1 to run grenade. export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 28b5761a..4fd593b5 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -62,6 +62,12 @@ function setup_localrc() { else MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net fi + if [ "$DEVSTACK_GATE_HEAT" -eq "1" ]; then + MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,heat,h-api,h-api-cfn,h-api-cw,h-eng + # When uncommented this will download and register the most recent successfully built + # ubuntu-vm-heat-cfntools image from jenkins.tripleo.org + # echo "IMAGE_URLS+=,\"http://jenkins.tripleo.org:8080/job/autobuilt-images/elements=ubuntu%20vm%20heat-cfntools/lastSuccessfulBuild/artifact/ubuntu-vm-heat-cfntools.qcow2\"" >>localrc + fi fi cat <>localrc