X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fshell%2Fta-rpm-deploy.sh;h=f0381e88cb8ab68dedd8d9f3f17200f953fc9835;hp=aa46e7a466fe4428e5875ccf8cd1d2d86e5c66cc;hb=bc1b37118fe6230985b6952b90a6b9f96d6202f7;hpb=c109904304d487c973b3bcfab90425661826a401

diff --git a/jjb/shell/ta-rpm-deploy.sh b/jjb/shell/ta-rpm-deploy.sh
index aa46e7a..f0381e8 100644
--- a/jjb/shell/ta-rpm-deploy.sh
+++ b/jjb/shell/ta-rpm-deploy.sh
@@ -22,11 +22,12 @@ 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|'`
 
 #Creating dirs to move duplicate RPMs/SRPMs to avoid re-upload and copy the changed RPMs/SRPMs
+rm -rf "$results_dir/repo/duplicates" "$results_dir/src_repo/duplicates"
 mkdir "$results_dir/repo/duplicates"
 mkdir "$results_dir/src_repo/duplicates"
 mkdir -p "$arch_dir"
@@ -36,7 +37,7 @@ mkdir -p "$sources_dir"
 for artifact in \
   `ls $results_dir/repo/*.rpm`
     do
-        if curl --head --fail $nexus_repo_url/$release_path/rpms/$(uname -m)/$(basename $artifact)
+        if curl -L --head --fail $nexus_repo_url/$release_path/rpms/$(uname -m)/$(basename $artifact)
         then
             echo "RPM - $(basename $artifact) already available in Nexus"
             mv $results_dir/repo/$(basename $artifact) $results_dir/repo/duplicates/
@@ -50,7 +51,7 @@ for artifact in \
 for artifact in \
   `ls $results_dir/src_repo/*.rpm`
     do
-        if curl --head --fail $nexus_repo_url/$release_path/rpms/Sources/$(basename $artifact)
+        if curl -L --head --fail $nexus_repo_url/$release_path/rpms/Sources/$(basename $artifact)
         then
             echo "Source RPM - $(basename $artifact) already available in Nexus"
             mv $results_dir/src_repo/$(basename $artifact) $results_dir/src_repo/duplicates/