From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 3 Sep 2020 00:29:32 +0000 (-0700)
Subject: Improve python-tools-install.sh alpine compat
X-Git-Tag: v0.57.3~2^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=b9eb4581940562effcf67863704a3ec2c47ceca0;hp=50b6737cb8b73ea2311b2992e7dfd6611f60b07c;p=releng%2Fglobal-jjb.git

Improve python-tools-install.sh alpine compat

Improve alpine compatibility by changing the mktemp call in
python-tools-install.sh to be compatible with both GNU mktemp as well
as BusyBox mktemp (which is used in alpine).

Change-Id: I7123d8928415c163ec26540c42fa0a96108b84e4
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/releasenotes/notes/mktemp-busybox-compat-6fc10440960db8c4.yaml b/releasenotes/notes/mktemp-busybox-compat-6fc10440960db8c4.yaml
new file mode 100644
index 00000000..91bd93a4
--- /dev/null
+++ b/releasenotes/notes/mktemp-busybox-compat-6fc10440960db8c4.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Improve alpine compatibility by changing the mktemp call in
+    python-tools-install.sh to be compatible with both GNU mktemp as well as
+    BusyBox mktemp (which is used in alpine).
diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index adcca1c5..578923c8 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -15,7 +15,7 @@ set -eufo pipefail
 # This script will typically be called during pre-build & post-build.
 # Create the user venv during pre-build.
 if [[ ! -f /tmp/pre-build-complete ]]; then
-    requirements_file=$(mktemp /tmp/requirements-XXXX.txt)
+    requirements_file=$(mktemp /tmp/requirements-XXXXXX)
 
     # Note: To test lftools master branch change the lftools configuration below in
     #       the requirements file from "lftools[openstack]~=#.##.#" to