X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-download-artifact.sh;h=c12406cdb34fb301f371fca8ca3198f76abac30d;hb=98cbaa71f0982fd31c1600067552a3da6d795483;hp=7293e8243fea48f82d8b1240af53c76b1ab44c3f;hpb=e7d0ada29bd6acf2dab0fb79b8cbfa3b4e20fa0a;p=releng.git

diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 7293e8243..c12406cdb 100755
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -10,7 +10,10 @@ echo
 
 [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY
 
-if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
+# if upstream we do not need to download anything
+if [[ "$DEPLOY_SCENARIO" =~ upstream ]]; then
+  echo "Upstream deployment detected, skipping download artifact"
+elif [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   # dev build
   GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$')
   export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}"
@@ -39,7 +42,13 @@ else
   VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
   # build RPM List which already includes base Apex RPM
   RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm"
-  RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm"
+
+  # add back legacy support for danube
+  if [ "$BRANCH" == 'stable/danube' ]; then
+    RPM_LIST+=" opnfv-apex-common-${VERSION_EXTENSION}.noarch.rpm"
+  else
+    RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm"
+  fi
 
   # remove old / install new RPMs
   if rpm -q opnfv-apex > /dev/null; then
@@ -52,7 +61,7 @@ else
   mkdir -p ~/apex_rpms
   pushd ~/apex_rpms
   # Remove older rpms which do not match this version
-  find . ! -name *${VERSION_EXTENSION}.noarch.rpm -type f -exec rm -f {} +
+  find . ! -name "*${VERSION_EXTENSION}.noarch.rpm" -type f -exec rm -f {} +
   # Download RPM only if changed on server
   for rpm in $RPM_LIST; do
     wget -N ${RPM_INSTALL_PATH}/${rpm}