From e801e35d26c116e45f29837f394eb4189b0ed06f Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 20 Sep 2016 03:32:01 +0900 Subject: [PATCH] Update example local.conf to consume stable/newton branch Change-Id: I4116e1380bdf48bb8a229c7d6967e67b4ddafaf8 --- checksite/horizon-reload.sh | 3 ++- checksite/local.conf | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/checksite/horizon-reload.sh b/checksite/horizon-reload.sh index 611baf0..819529e 100644 --- a/checksite/horizon-reload.sh +++ b/checksite/horizon-reload.sh @@ -1,9 +1,10 @@ #!/bin/bash # Target branch: master, stable/newton, ... -BRANCH=master +BRANCH=stable/newton cd /opt/stack/horizon +git checkout $BRANCH git remote update origin git merge origin/$BRANCH ./run_tests.sh --compilemessages -N diff --git a/checksite/local.conf b/checksite/local.conf index dd7f65a..3981b90 100644 --- a/checksite/local.conf +++ b/checksite/local.conf @@ -1,5 +1,15 @@ [[local|localrc]] -BRANCH=master +BRANCH=stable/newton +# NOTE: We need to specify a branch explicitly until DevStack stable branch +# is prepared. At now, swift has no stable/newton branch. +CINDER_BRANCH=$BRANCH +GLANCE_BRANCH=$BRANCH +HEAT_BRANCH=$BRANCH +HORIZON_BRANCH=$BRANCH +KEYSTONE_BRANCH=$BRANCH +NEUTRON_BRANCH=$BRANCH +NOVA_BRANCH=$BRANCH +SWIFT_BRANCH=master # When OS_CLOUD envvar is set, DevStack will be confused. unset OS_CLOUD