X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-download-artifact.sh;h=68baf59da6b8af28261768918782dfcefe26c5fe;hb=2a202ed81e0a3b9995137369d10adac7faf26c62;hp=7293e8243fea48f82d8b1240af53c76b1ab44c3f;hpb=2dbeceafaf72fa94e1c4c928bf3b38b5690273cf;p=releng.git diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index 7293e8243..68baf59da 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -39,7 +39,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 +58,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}