openstack/devstack-gate
Code Issues Proposed changes

Fix stable branch conditional.

Browse Source 
Change-Id: I76728a215d2ff00572f912a53d1d9b81306dd557
This commit is contained in:
James E. Blair
2012-07-26 09:47:37 -07:00
parent 398f6af1d8
commit c4cc52393d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack-vm-gate-wrap.sh
View File

@@ -83,8 +83,6 @@ function setup_workspace {
GERRIT_BRANCH=master
fi
export GERRIT_BRANCH
export GERRIT_PROJECT
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org
cd $DEST

3
devstack-vm-gate.sh
View File

@@ -29,7 +29,8 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,tempest
fi
if [ "$BRANCH" != "stable/diablo" ] && [ "$BRANCH" != "stable/essex" ]; then
if [ "$GERRIT_BRANCH" != "stable/diablo" ] &&
[ "$GERRIT_BRANCH" != "stable/essex" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
else
ENABLED_SERVICES=$ENABLED_SERVICES,n-vol