diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-17 17:43:46 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-17 15:52:07 +0000 |
| commit | 55ffe9aead06fc13b885c5dd04a170856c35b3c9 (patch) | |
| tree | 96767d3c3057fbc05b167f7e5ac274777d7c1d41 | |
| parent | 1df451788541046609e2bdda1b395b4109e8ca70 (diff) | |
fuel-deploy.sh: source local_env from securedlab
While at it, revert BRIDGE default value to "pxebr" after recent
Fuel rework was merged in [1].
This mechanism will be leveraged by [2].
Partially reverts commit: 68195fd
[1] https://gerrit.opnfv.org/gerrit/#/c/38855/
[2] https://gerrit.opnfv.org/gerrit/#/c/39521/
Change-Id: Ic61487384029a7d16547a5035a1f1b34ecbea8d4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 11 | ||||
| -rw-r--r-- | jjb/global/installer-params.yml | 2 | ||||
| -rwxr-xr-x | jjb/multisite/fuel-deploy-for-multisite.sh | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 08d323325..fc5912008 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -91,7 +91,7 @@ fi # construct the command DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \ -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \ - -B ${DEFAULT_BRIDGE:-,,,} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \ + -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \ ${DEPLOY_CACHE}" # log info to console diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 29b173ae5..eebd8bc71 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -33,7 +33,7 @@ fi # set deployment parameters export TMPDIR=$HOME/tmpdir -BRIDGE=${BRIDGE:-,,,} +BRIDGE=${BRIDGE:-pxebr} LAB_NAME=${NODE_NAME/-*} POD_NAME=${NODE_NAME/*-} @@ -63,13 +63,20 @@ echo "Cloning securedlab repo $BRANCH" git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \ --branch $BRANCH +# Source local_env if present, which contains POD-specific config +local_env="${WORKSPACE}/securedlab/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env" +if [ -e "${local_env}" ]; then + echo "-- Sourcing local environment file" + source "${local_env}" +fi + # log file name FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" # construct the command DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab \ -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso \ - -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME" + -B ${DEFAULT_BRIDGE:-${BRIDGE}} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME" # log info to console echo "Deployment parameters" diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index c4e715d5c..a81dce3fe 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -55,7 +55,7 @@ description: 'external network for test' - string: name: BRIDGE - default: ',,,' + default: 'pxebr' description: 'Bridge(s) to be used by salt master' - parameter: diff --git a/jjb/multisite/fuel-deploy-for-multisite.sh b/jjb/multisite/fuel-deploy-for-multisite.sh index 827e5c28d..56c20787a 100755 --- a/jjb/multisite/fuel-deploy-for-multisite.sh +++ b/jjb/multisite/fuel-deploy-for-multisite.sh @@ -46,7 +46,7 @@ curl -L -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2 # set deployment parameters DEPLOY_SCENARIO="os-nosdn-nofeature-noha" export TMPDIR=$HOME/tmpdir -BRIDGE=${BRIDGE:-,,,} +BRIDGE=${BRIDGE:-pxebr} LAB_NAME=${NODE_NAME/-*} POD_NAME=${NODE_NAME/*-} |