summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-01-26 00:42:24 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-01-26 00:42:24 -0600
commit5859be915ff8195855ba0e58b1c64d0be79a4963 (patch)
tree8e42b76e908f84efa80bc213419f436982b6df63
parent76d12ac2d4bfd964f8a2851983aaa0098df380d8 (diff)
clean and fix build error
This patch is cleanup of non required code and fix the EOF issue ssen in deployment. Change-Id: I55fb52bbc7d4048975fc0ce0b29caca8e4137d2d Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rw-r--r--jjb/joid/joid-deploy.sh19
1 files changed, 3 insertions, 16 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index da5dcf043..e197dbd8c 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -48,7 +48,7 @@ cd $WORKSPACE/ci
if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
echo "------ Recover Juju environment to use MAAS ------"
- if [ -e deployconfig.yaml ]; then
+ if [ ! -e deployconfig.yaml ]; then
cp $LAB_CONFIG/deployconfig.yaml .
cp $LAB_CONFIG/deployment.yaml .
cp $LAB_CONFIG/labconfig.yaml .
@@ -150,21 +150,8 @@ if [ "$JOID_MODEL" == 'os' ]; then
# export the openrc file by getting the one generated by joid and add SDN
# controller for Functest
# cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
- cat << EOF >> $JOID_ADMIN_OPENRC
- export SDN_CONTROLLER=$SDN_CONTROLLER_IP
- export SDN_PASSWORD=$SDN_PASSWORD
- EOF
-
- ##
- ## Backup local juju env
- ##
-
- echo "------ Backup Juju environment ------"
- cp environments.yaml $LAB_CONFIG/
- cp deployment.yaml $LAB_CONFIG/
- if [ -e deployconfig.yaml ]; then
- cp deployconfig.yaml $LAB_CONFIG
- fi
+ echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC
+ echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC
fi