Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[compass4nfv] add DEPLOY_SCENARIO macro"
[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
7293e82
..
68baf59
100755
(executable)
--- 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"
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
# 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
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}
# Download RPM only if changed on server
for rpm in $RPM_LIST; do
wget -N ${RPM_INSTALL_PATH}/${rpm}