From 531df017cd765b63359cadc77696b972913e3d7d Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 5 Apr 2023 10:50:54 +0200 Subject: [PATCH] Update Jenkinsfile There were some changes in the insights-frontend-build-common that we were missing. --- .travis/Jenkinsfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis/Jenkinsfile b/.travis/Jenkinsfile index e395b4eb..6faa5d1d 100644 --- a/.travis/Jenkinsfile +++ b/.travis/Jenkinsfile @@ -10,7 +10,7 @@ node { passphraseVariable: "", usernameVariable: "")]) { - String APP_NAME = "image-builder" + String APP_NAME = "__APP_NAME__" String BRANCH = env.BRANCH_NAME.replaceAll("origin/", "") if (BRANCH == "prod-stable") { @@ -40,21 +40,18 @@ node { AKAMAI_BASE_PATH = "822386" AKAMAI_APP_PATH = "/${AKAMAI_BASE_PATH}/${PREFIX}apps/${APP_NAME}" - configFileProvider([configFile(fileId: "9f0c91bc-4feb-4076-9f3e-13da94ff3cef", variable: "AKAMAI_HOST_KEY")]) { - sh """ + sh """ eval `ssh-agent` ssh-add \"$privateKeyFile\" - cp $AKAMAI_HOST_KEY ~/.ssh/known_hosts chmod 600 ~/.ssh/known_hosts ~/.ssh/config n=0 until [ \$n -ge 10 ] do - rsync -arv -e \"ssh -2\" --delete-after * sshacs@cloud-unprotected.upload.akamai.com:${AKAMAI_APP_PATH} && break + rsync -arv -e \"ssh -2 -o StrictHostKeyChecking=no\" * sshacs@cloud-unprotected.upload.akamai.com:${AKAMAI_APP_PATH} && break n=\$[\$n+1] sleep 10 done - """ - } + """ //Clear the cache for the app being deployed openShiftUtils.withJnlpNode(