From c73b99dd7b376740125636ae07cf2c81985ef214 Mon Sep 17 00:00:00 2001 From: raghuramamendru Date: Fri, 17 May 2019 01:14:33 -0500 Subject: [PATCH] [ta] Moved RPMs to Nexus3 Includes: - TA RPMs moved from Nexus2 to Nexus3 - "ta-settings" used instead of "images-snapshots-settings" Change-Id: I07cd86f09ec8fc0aa43c0f0b8eb328dfa8102edf Signed-off-by: raghuramamendru --- jjb/akraino-templates/akraino-ta-common-macros.yaml | 8 +++++--- jjb/shell/ta-rpm-deploy.sh | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 874d166..7cfbfe1 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -122,10 +122,12 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'images-snapshots-settings' + - file-id: 'ta-settings' variable: 'SETTINGS_FILE' + - inject: + properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org' - lf-infra-create-netrc: - server-id: images-snapshots + server-id: rpm.snapshots - shell: !include-raw: # Ensure python-tools are installed in case job template does not # call the lf-infra-pre-build macro. @@ -141,7 +143,7 @@ - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: 'images-snapshots-settings' + - file-id: 'ta-settings' variable: 'SETTINGS_FILE' - lf-infra-create-netrc: server-id: images-snapshots diff --git a/jjb/shell/ta-rpm-deploy.sh b/jjb/shell/ta-rpm-deploy.sh index e89411b..36c7c5b 100644 --- a/jjb/shell/ta-rpm-deploy.sh +++ b/jjb/shell/ta-rpm-deploy.sh @@ -16,13 +16,13 @@ set -eu -o pipefail set -x # Trace commands for this script to make debugging easier. -NEXUS_REPO=images-snapshots +NEXUS_REPO=rpm.snapshots release_path=TA/release-1 repo_dir="$WORKSPACE/work/nexus/$NEXUS_REPO" x86_dir="$repo_dir/$release_path/rpms/x86_64" sources_dir="$repo_dir/$release_path/rpms/Sources" -nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO" +nexus_repo_url="$ALT_NEXUS_URL/repository/$NEXUS_REPO" mkdir -p "$x86_dir" mkdir -p "$sources_dir" -- 2.16.6