Fix rpms being installed via DeployArtifactURLs
authorAlex Schultz <aschultz@redhat.com>
Fri, 9 Jun 2017 21:55:16 +0000 (15:55 -0600)
committerAlex Schultz <aschultz@redhat.com>
Fri, 9 Jun 2017 21:55:16 +0000 (15:55 -0600)
The deploy-artifacts.sh script is supposed to support installing rpms
when provided by DeployArtifactUrls. The problem is that it uses yum to
install which does not actually work unless the filename ends with .rpm.
This change updates the script to rename the downloaded file to end with
.rpm if it is an rpm so that it is properly installed.

Change-Id: I048d2b4474f9efe424e98e3868f325704e9c352f
Closes-Bug: #1697102

puppet/deploy-artifacts.sh
releasenotes/notes/fix-rpm-deploy-artifact-urls-03d5694073ad159d.yaml [new file with mode: 0644]

index 4e1ad89..9f23186 100644 (file)
@@ -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."
       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 (file)
index 0000000..25016e8
--- /dev/null
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix support for RPMs to be installed via DeployArtifactURLs. LP#1697102