From 3737ed9841f8f8b44fec3f7dfc477984e85ff772 Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 13 Jun 2019 17:53:16 +0800 Subject: [PATCH] Deploy SEBA on compass task Deploy seba into community CI/CD platform Signed-off-by: Jianlin Lv Change-Id: I17fa9bae5a5a0b65ef5af790b4e1b8f75e9a6f7a --- jjb/iec/iec-seba_on_arm.sh | 8 +++++++- jjb/iec/iec.yaml | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) mode change 100644 => 100755 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 new mode 100755 index 2db62c7..ab0f293 --- a/jjb/iec/iec-seba_on_arm.sh +++ b/jjb/iec/iec-seba_on_arm.sh @@ -20,6 +20,12 @@ case "${JOB_NAME}" in K8S_SSH_KEY=${SSH_KEY} IEC_DIR="/home/${K8S_SSH_USER}/iec" ;; + *compass*) + K8S_MASTER_IP=${K8S_MASTER_IP_COMPASS} + K8S_SSH_USER=${K8S_SSH_USER_COMPASS} + K8S_SSH_PASSWORD=${K8S_SSH_PASSWORD_COMPASS} + IEC_DIR="/${K8S_SSH_USER_COMPASS}/iec" + ;; *) echo "Cannot determine installer from ${JOB_NAME}" exit 1 @@ -36,7 +42,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 diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 8ec06aa..0e6308c 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -92,6 +92,18 @@ name: K8S_SSH_KEY default: '' description: 'SSH key to connect to the K8s master' + - string: + name: K8S_MASTER_IP_COMPASS + default: '10.1.0.50' + description: 'IP address to compass connect to the K8s master' + - string: + name: K8S_SSH_PASSWORD_COMPASS + default: 'root' + description: 'SSH password to compass connect to the K8s master' + - string: + name: K8S_SSH_USER_COMPASS + default: 'root' + description: 'SSH username to compass connect to the K8s master' ######################## # job templates -- 2.16.6