Apex: fixes downloading artifacts for rpms/iso

[releng.git] / jjb / apex / apex-download-artifact.sh

diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index f253251..206c627 100755 (executable)
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -23,14 +23,13 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   tar -xvf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
   popd > /dev/null
 else
-  echo "Will download RPMs and ISO..."
+  echo "Will download RPMs..."
 
   # Must be RPMs/ISO
-  export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
-  echo "Downloading opnfv-${OPNFV_ARTIFACT_VERSION}.properties"
+  echo "Downloading latest properties file"
 
   # get the properties file in order to get info regarding artifacts
-  curl --fail -s -o $BUILD_DIRECTORY/opnfv.properties http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties
+  curl --fail -s -o $BUILD_DIRECTORY/opnfv.properties http://$GS_URL/latest.properties
 
   # source the file so we get OPNFV vars
   source $BUILD_DIRECTORY/opnfv.properties
@@ -56,15 +55,6 @@ else
     echo "Unable to install new RPMs: $RPM_LIST"
     exit 1
   fi
-
-  # log info to console
-  echo "Downloading the ISO artifact using URL http://$OPNFV_ARTIFACT_URL"
-  echo "--------------------------------------------------------"
-  echo
-
-  # Download ISO
-  curl --fail -s -o $BUILD_DIRECTORY/apex.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
-
 fi
 
 # TODO: Uncomment these lines to verify SHA512SUMs once the sums are