X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fshell%2Fseba_on_arm.sh;fp=jjb%2Fiec%2Fiec-seba_on_arm.sh;h=c695f92a507ef0a95c921267a7c9f17b4177a65e;hp=b0a062ca6c59f385d82f75af6f44484df55986ff;hb=0e625d36949544760caa32c269086d4817f295b5;hpb=6ca12719612476bf0d40e10aa977eaf9176a1421

diff --git a/jjb/iec/iec-seba_on_arm.sh b/jjb/shell/seba_on_arm.sh
similarity index 78%
rename from jjb/iec/iec-seba_on_arm.sh
rename to jjb/shell/seba_on_arm.sh
index b0a062c..c695f92 100755
--- a/jjb/iec/iec-seba_on_arm.sh
+++ b/jjb/shell/seba_on_arm.sh
@@ -37,24 +37,18 @@ run_on_k8s_master () {
   then
     eval sshpass -p "${K8S_SSH_PASSWORD}" "${_c}" \
          -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-         ${_o} "${K8S_SSH_USER}"@"${K8S_MASTER_IP}${_s}" "$@"
+         "${K8S_SSH_USER}@${K8S_MASTER_IP}${_s}" "$@"
   elif [ -n "${K8S_SSH_KEY}" ]
   then
-    eval ${_c} -i "${K8S_SSH_KEY}" \
+    eval "${_c}" -i "${K8S_SSH_KEY}" \
          -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-         ${_o} "${K8S_SSH_USER}"@"${K8S_MASTER_IP}${_s}" "$@"
+         "${K8S_SSH_USER}@${K8S_MASTER_IP}${_s}" "$@"
   else
     echo "Neither K8S_SSH_PASSWORD nor K8S_SSH_KEY are set"
     exit 1
   fi
 }
 
-if [ -z "$K8S_SSH_USER" ]
-then
-  echo "K8S_SSH_USER not set, cannot ssh to K8S master, aborting"
-  exit 1
-fi
-
 case "${JOB_NAME}" in
   *fuel*)
     K8S_MASTER_IP=$(docker exec fuel cat /etc/hosts | grep iec01 \
@@ -69,18 +63,35 @@ case "${JOB_NAME}" in
     IEC_DIR="/${K8S_SSH_USER}/iec"
     KUBE_DIR="~${K8S_SSH_USER}/.kube"
     ;;
+  *rec*)
+    # CLUSTER_{MASTER_IP,SSH_USER,SSH_PASSWORD} are already set by job params
+    K8S_MASTER_IP=${CLUSTER_MASTER_IP}
+    K8S_SSH_USER=${CLUSTER_SSH_USER}
+    K8S_SSH_PASSWORD=${CLUSTER_SSH_PASSWORD}
+    IEC_DIR="/var/lib/akraino/iec"
+    KUBE_DIR="~${K8S_SSH_USER}/.kube"
+    UPSTREAM_PROJECT='rec'
+    ;;
   *)
     echo "Cannot determine installer from ${JOB_NAME}"
     exit 1
     ;;
 esac
 
+if [ -z "$K8S_SSH_USER" ]
+then
+  echo "K8S_SSH_USER not set, cannot ssh to K8S master, aborting"
+  exit 1
+fi
+
+export K8S_MASTER_IP UPSTREAM_PROJECT="${UPSTREAM_PROJECT:-${PROJECT}}"
+
 case "${JOB_NAME}" in
-  iec-*-install-seba_on_arm*)
-    INSTALL_CMD="'cd ${IEC_DIR}/src/use_cases/seba_on_arm/install; ./install.sh'"
+  *-install-seba_on_arm*)
+    INSTALL_CMD="'cd ${IEC_DIR}/src/use_cases/seba_on_arm/install; ./install.sh ${UPSTREAM_PROJECT}'"
     run_on_k8s_master ssh "${INSTALL_CMD}"
     ;;
-  iec-*-test-seba_on_arm*)
+  *-test-seba_on_arm*)
 
     case "${PON_TYPE}" in
       *ponsim*)
@@ -96,11 +107,11 @@ case "${JOB_NAME}" in
     run_on_k8s_master scp "${KUBE_DIR}" "${WORKSPACE}"
 
     SEBA_TEST_DIR="src/use_cases/seba_on_arm/test"
-    TEST_CMD="${SEBA_TEST_DIR}/${PON_TYPE}/test.sh"
+    TEST_CMD="${SEBA_TEST_DIR}/${PON_TYPE}/test.sh ${UPSTREAM_PROJECT}"
     echo "Issuing command"
     echo "${TEST_CMD}"
 
-    eval ${TEST_CMD}
+    eval "${TEST_CMD}"
     ;;
   *)
     echo "Cannot determine what to do for seba_on_arm from ${JOB_NAME}"