diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-01-26 13:19:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-26 13:19:43 +0000 |
| commit | e530e214abd0080e81c16b14d87751c1357d2ae5 (patch) | |
| tree | df823e657ecdb9107d0e5ef12ae5ebd1879d6342 /jjb | |
| parent | bcc1c0a7d2a8dc9d5771e080ad727b137b45943c (diff) | |
| parent | 5859be915ff8195855ba0e58b1c64d0be79a4963 (diff) | |
Merge "clean and fix build error This patch is cleanup of non required code and fix the EOF issue ssen in deployment."
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 19 |
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 |