armband: updated lab-config URL

Change-Id: I317321bbaf1e74419b9508c6da3039b95d9d399d
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>

diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index 8b0af31..901f845 100755 (executable)
--- 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 3dc9be1..ee74914 100644 (file)
--- 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'