Merge "Fix rpms being installed via DeployArtifactURLs"
This commit is contained in:
commit
ffcc946a6b
|
@ -10,7 +10,9 @@ if [ -n "$artifact_urls" ]; then
|
||||||
for URL in $(echo $artifact_urls | sed -e "s| |\n|g" | sort -u); do
|
for URL in $(echo $artifact_urls | sed -e "s| |\n|g" | sort -u); do
|
||||||
curl --globoff -o $TMP_DATA/file_data "$URL"
|
curl --globoff -o $TMP_DATA/file_data "$URL"
|
||||||
if file -b $TMP_DATA/file_data | grep RPM &>/dev/null; then
|
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
|
elif file -b $TMP_DATA/file_data | grep 'gzip compressed data' &>/dev/null; then
|
||||||
pushd /
|
pushd /
|
||||||
tar xvzf $TMP_DATA/file_data
|
tar xvzf $TMP_DATA/file_data
|
||||||
|
@ -19,7 +21,9 @@ if [ -n "$artifact_urls" ]; then
|
||||||
echo "ERROR: Unsupported file format: $URL"
|
echo "ERROR: Unsupported file format: $URL"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
rm $TMP_DATA/file_data
|
if [ -f $TMP_DATA/file_data ]; then
|
||||||
|
rm $TMP_DATA/file_data
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo "No artifact_urls was set. Skipping..."
|
echo "No artifact_urls was set. Skipping..."
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fix support for RPMs to be installed via DeployArtifactURLs. LP#1697102
|
Loading…
Reference in New Issue