Merge "Enable merge jobs to trigger downstream job"

[ci-management.git] / jjb / iec / iec-seba_on_arm.sh

diff --git a/jjb/iec/iec-seba_on_arm.sh b/jjb/iec/iec-seba_on_arm.sh
old mode 100644 (file)
new mode 100755 (executable)
index 2db62c7..3f1e2e5
--- a/jjb/iec/iec-seba_on_arm.sh
+++ b/jjb/iec/iec-seba_on_arm.sh
@@ -18,7 +18,11 @@ case "${JOB_NAME}" in
                     | awk '{print $1}')
     # On Fuel deployements the K8s ssh key is the one used by the deploy job
     K8S_SSH_KEY=${SSH_KEY}
-    IEC_DIR="/home/${K8S_SSH_USER}/iec"
+    IEC_DIR="/var/lib/akraino/iec"
+    ;;
+  *compass*)
+    # K8S_{MASTER_IP,SSH_USER,SSH_PASSWORD} are already set by job params
+    IEC_DIR="/${K8S_SSH_USER}/iec"
     ;;
   *)
     echo "Cannot determine installer from ${JOB_NAME}"
@@ -36,7 +40,7 @@ INSTALL_CMD="cd ${IEC_DIR}/src/use_cases/seba_on_arm/install; ./install.sh"
 
 if [ -n "${K8S_SSH_PASSWORD}" ]
 then
-  sshpass -o StrictHostKeyChecking=no -p "${K8S_SSH_PASSWORD}" \
+  sshpass -p "${K8S_SSH_PASSWORD}" ssh -o StrictHostKeyChecking=no \
     "${K8S_SSH_USER}"@"${K8S_MASTER_IP}" "${INSTALL_CMD}"
 elif [ -n "${K8S_SSH_KEY}" ]
 then