summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-06-09 08:43:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-09 08:43:13 +0000
commit08e5e1c92db49df8d902cd49b8dba57a50968e34 (patch)
tree39586bc822772488f6f709e930f353344f13b501 /jjb
parentcdff7d8d41693971f4c5dc8dd18d6907a5e31937 (diff)
parentb671598be465f6b46028b3189375d41c01044c44 (diff)
Merge "armband: updated lab-config URL"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/armband/armband-deploy.sh8
-rw-r--r--jjb/opnfv/slave-params.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index 8b0af31e3..901f845bf 100755
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -30,8 +30,7 @@ else
fi
# set deployment parameters
-export TMPDIR=$HOME/tmpdir
-BRIDGE=${DEFAULT_BRIDGE:-pxebr}
+export TMPDIR=${WORKSPACE}/tmpdir
LAB_NAME=${NODE_NAME/-*}
POD_NAME=${NODE_NAME/*-}
@@ -47,7 +46,8 @@ echo "Using configuration for $LAB_NAME"
mkdir -p $TMPDIR
cd $WORKSPACE
-if [[ $LAB_CONFIG_URL =~ ^git:// ]]; then
+if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then
+ echo "cloning $LAB_CONFIG_URL"
git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config
LAB_CONFIG_URL=file://${WORKSPACE}/lab-config
fi
@@ -56,7 +56,7 @@ fi
ISO_FILE=$WORKSPACE/opnfv.iso
# construct the command
-DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -l $LAB_NAME -p $POD_NAME -b ${LAB_CONFIG_URL} -s $DEPLOY_SCENARIO -i file://${ISO_FILE} -H -B $BRIDGE -S $TMPDIR"
+DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -l $LAB_NAME -p $POD_NAME -b ${LAB_CONFIG_URL} -s $DEPLOY_SCENARIO -i file://${ISO_FILE} -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR"
# log info to console
echo "Deployment parameters"
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 3dc9be132..ee749141f 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -681,5 +681,5 @@
description: 'Deployment timeout in minutes'
- string:
name: LAB_CONFIG_URL
- default: file://$HOME/opnfv/repos/lab-config
+ default: ssh://git@git.enea.com/pharos/lab-config
description: 'Base URI to the configuration directory'