From 633aff42792dd136d79277b453b7045096f9dc7a Mon Sep 17 00:00:00 2001 From: David C Kennedy Date: Mon, 20 Jun 2016 10:02:47 +0100 Subject: [PATCH] Vagrant to use local branch for devstack By default devstack was cloning master when setting up devstack. This change has the devstack plugin clone the local working branch so that uncommitted changes can be tested. Change-Id: If963ea1d703cd9d4d96665e75db08834cf473b33 --- tools/vagrant/setup_local_repos.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/vagrant/setup_local_repos.sh b/tools/vagrant/setup_local_repos.sh index c4dacc4..1e64b3c 100644 --- a/tools/vagrant/setup_local_repos.sh +++ b/tools/vagrant/setup_local_repos.sh @@ -15,6 +15,19 @@ git config --global user.name "Local devstack committer" git add --all git commit -m "Local commit" +CURRENT_BRANCH=`git status | grep 'On branch' | sed 's/On branch //'` +if [ ${CURRENT_BRANCH} != 'master' ] +then + echo Maintaining current branch ${CURRENT_BRANCH} + # set the branch to what we're using in local.conf + sed -i "s/enable_plugin monasca-transform \/home\/vagrant\/monasca-transform//g" /home/vagrant/devstack/local.conf + sed -i "s/# END DEVSTACK LOCAL.CONF CONTENTS//g" /home/vagrant/devstack/local.conf + + printf "enable_plugin monasca-transform /home/vagrant/monasca-transform ${CURRENT_BRANCH}\n" >> /home/vagrant/devstack/local.conf + printf "# END DEVSTACK LOCAL.CONF CONTENTS" >> /home/vagrant/devstack/local.conf +fi + + cd ../monasca-api git add --all