From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 3 Mar 2020 19:34:53 +0000 (+0000)
Subject: Merge "iec: fuel: Account for Jenkins slave rename"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=90b585d904692d3986b8f53dbede7406b131171b;hp=5129f234847eecf36c5519760945de6907686b92

Merge "iec: fuel: Account for Jenkins slave rename"
---

diff --git a/jjb/shell/ta-iso-deploy.sh b/jjb/shell/ta-iso-deploy.sh
index 705ac3c..e40eeba 100644
--- a/jjb/shell/ta-iso-deploy.sh
+++ b/jjb/shell/ta-iso-deploy.sh
@@ -19,11 +19,11 @@ set -x  # Trace commands for this script to make debugging easier.
 set +f  # Ensure filename expansion (globbing) is enabled
 
 NEXUS_REPO=images-snapshots
-release_path=TA/release-1
+release_path=TA/images/${JOB_NAME##*-}
 
 repo_dir="$WORKSPACE/work/nexus/$NEXUS_REPO"
-upload_dir1="$repo_dir/$release_path/images/$BUILD_ID"
-upload_dir2="$repo_dir/$release_path/images/latest"
+upload_dir1="$repo_dir/$release_path/$BUILD_ID"
+upload_dir2="$repo_dir/$release_path/latest"
 nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
 
 mkdir -p "$upload_dir1"
@@ -43,6 +43,7 @@ cp "$WORKSPACE/work/results/images/"* "$upload_dir2"
 
 echo "-----> Upload ISOs to Nexus"
 lftools deploy nexus "$nexus_repo_url" "$repo_dir"
+rm -rf "$repo_dir"
 
 set +x  # Disable trace since we no longer need it.
 echo "ISOs location: <a href=\"$nexus_repo_url\">$nexus_repo_url</a>"