Merge "bugfix: fail to generate APIs document"

[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 0aced82..52c3c67 100755 (executable)
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -3,7 +3,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-APEX_PKGS="common undercloud" # removed onos for danube
+APEX_PKGS="common undercloud onos"
+
+# log info to console
+echo "Downloading the Apex artifact. This could take some time..."
+echo "--------------------------------------------------------"
+echo
 
 [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY
 
@@ -13,16 +18,18 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
   # get build artifact
   pushd ${BUILD_DIRECTORY} > /dev/null
-  echo "Downloading packaged dev build..."
+  echo "Downloading packaged dev build: apex-${OPNFV_ARTIFACT_VERSION}.tar.gz"
   curl --fail -s -o $BUILD_DIRECTORY/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz http://$GS_URL/apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
   tar -xvf apex-${OPNFV_ARTIFACT_VERSION}.tar.gz
   popd > /dev/null
 else
+  echo "Will download RPMs..."
+
   # Must be RPMs/ISO
-  export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+  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
@@ -48,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