From 5aa8ba07665dd4e353e488415416660eecd9bc7d Mon Sep 17 00:00:00 2001 From: Dimitri Mazmanov Date: Tue, 9 Aug 2016 14:44:21 +0200 Subject: Remove kingbird folder before cloning If one deployment fails, all subsequent jenkins runs will fail due to the git clone command failing because of the existing kingbird folder. Moving folder cleanup before the clone operation. Change-Id: Ief1e70f10f22c0811a483d4dd8cddccec8bd622a Signed-off-by: Dimitri Mazmanov --- tools/kingbird/install_kingbird.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/kingbird/install_kingbird.sh b/tools/kingbird/install_kingbird.sh index e4f8a3c..25d9b88 100644 --- a/tools/kingbird/install_kingbird.sh +++ b/tools/kingbird/install_kingbird.sh @@ -113,6 +113,9 @@ else --region ${OS_REGION_NAME} fi +# Cleanup the folder before making a fresh clone +rm -rf kingbird/ + #Setup Kingbird git clone https://github.com/openstack/kingbird.git && cd kingbird/ @@ -122,10 +125,6 @@ pip install --force-reinstall -U . mkdir -p /etc/kingbird/ oslo-config-generator --config-file tools/config-generator.conf --output-file ${KINGBIRD_CONF_FILE} -# Delete previous repo clone -cd .. -rm -rf kingbird/ - # Configure host section iniset ${KINGBIRD_CONF_FILE} DEFAULT bind_host ${bind_host} iniset ${KINGBIRD_CONF_FILE} DEFAULT bind_port ${KINGBIRD_PORT} -- cgit 1.2.3-korg