From: Eric Ball Date: Tue, 17 Sep 2019 23:03:44 +0000 (-0700) Subject: Add RPM_REPO_URL global variable X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=7575d2a1bd2d3d9af3d23b20432cc3fe8f100a01 Add RPM_REPO_URL global variable The ta-rpm-deploy.sh script is using ALT_NEXUS_URL to point to this URL, which is causing issues elsewhere in some jobs. What we really want is to set this globally, and have scripts use this global var rather than setting their own. Change-Id: I9b0017b42421610e4537063140b3d6d37421c21b Signed-off-by: Eric Ball --- diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index ba4dbbe..efe6327 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -6,6 +6,7 @@ JENKINS_HOSTNAME=vex-yul-akraino-jenkins-prod-1 LOGS_SERVER=https://logs.akraino.org NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 +RPM_REPO_URL=nexus3.akraino.org SIGUL_BRIDGE_IP=10.30.216.9 SIGUL_KEY=akraino-release-2018 SILO=production diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index f1ab6de..ec069e6 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -5,6 +5,7 @@ JENKINS_HOSTNAME=vex-yul-akraino-jenkins-sandbox-1 LOGS_SERVER=https://logs.akraino.org NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 +RPM_REPO_URL=nexus3.akraino.org SIGUL_BRIDGE_IP=10.30.216.9 SIGUL_KEY=akraino-sandbox SILO=sandbox diff --git a/jjb/shell/ta-rpm-deploy.sh b/jjb/shell/ta-rpm-deploy.sh index bd31a4c..da977c7 100644 --- a/jjb/shell/ta-rpm-deploy.sh +++ b/jjb/shell/ta-rpm-deploy.sh @@ -22,7 +22,7 @@ release_path=TA/release-1 repo_dir="$WORKSPACE/work/nexus/$NEXUS_REPO" arch_dir="$repo_dir/$release_path/rpms/$(uname -m)" sources_dir="$repo_dir/$release_path/rpms/Sources" -nexus_repo_url="$ALT_NEXUS_URL/repository/$NEXUS_REPO" +nexus_repo_url="$RPM_REPO_URL/repository/$NEXUS_REPO" results_dir="$WORKSPACE/work/results" repo_name=`echo $WORKSPACE | awk -F '/' '{print $4}' | cut -d '-' -f2- | sed 's|\(.*\)-.*|\1|'`