summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-23 17:05:14 +0000
committerGerrit Code Review <review@openstack.org>2017-06-23 17:05:14 +0000
commitffcc946a6bd2a74d003f20fa0f5330073c2ce4ac (patch)
tree24fd613d726c4ecd6a0df2ca16cf393af57041e7
parent94592cab5b013196456adb596ce241f4d14e2e78 (diff)
parent84e37fe8c7b10b7aceb7c97ffb97ede5480ea5ee (diff)
Merge "Fix rpms being installed via DeployArtifactURLs"
-rw-r--r--puppet/deploy-artifacts.sh8
-rw-r--r--releasenotes/notes/fix-rpm-deploy-artifact-urls-03d5694073ad159d.yaml4
2 files changed, 10 insertions, 2 deletions
diff --git a/puppet/deploy-artifacts.sh b/puppet/deploy-artifacts.sh
index 6e7f0ec1..e4d20b49 100644
--- a/puppet/deploy-artifacts.sh
+++ b/puppet/deploy-artifacts.sh
@@ -10,7 +10,9 @@ if [ -n "$artifact_urls" ]; then
for URL in $(echo $artifact_urls | sed -e "s| |\n|g" | sort -u); do
curl --globoff -o $TMP_DATA/file_data "$URL"
if file -b $TMP_DATA/file_data | grep RPM &>/dev/null; then
- yum install -y $TMP_DATA/file_data
+ mv $TMP_DATA/file_data $TMP_DATA/file_data.rpm
+ yum install -y $TMP_DATA/file_data.rpm
+ rm $TMP_DATA/file_data.rpm
elif file -b $TMP_DATA/file_data | grep 'gzip compressed data' &>/dev/null; then
pushd /
tar xvzf $TMP_DATA/file_data
@@ -19,7 +21,9 @@ if [ -n "$artifact_urls" ]; then
echo "ERROR: Unsupported file format: $URL"
exit 1
fi
- rm $TMP_DATA/file_data
+ if [ -f $TMP_DATA/file_data ]; then
+ rm $TMP_DATA/file_data
+ fi
done
else
echo "No artifact_urls was set. Skipping..."
diff --git a/releasenotes/notes/fix-rpm-deploy-artifact-urls-03d5694073ad159d.yaml b/releasenotes/notes/fix-rpm-deploy-artifact-urls-03d5694073ad159d.yaml
new file mode 100644
index 00000000..25016e83
--- /dev/null
+++ b/releasenotes/notes/fix-rpm-deploy-artifact-urls-03d5694073ad159d.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+ - |
+ Fix support for RPMs to be installed via DeployArtifactURLs. LP#1697102