From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 3 Sep 2020 17:16:43 +0000 (+0000)
Subject: Merge "Improve python-tools-install.sh alpine compat"
X-Git-Tag: v0.57.3~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=e3b47c77a181b5f5bd3a79802a46188adb6173ce;hp=2399be2ca1402a7d1043089c3c57d623d9bfc064;p=releng%2Fglobal-jjb.git

Merge "Improve python-tools-install.sh alpine compat"
---

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 d5a8f058..bf1cf8eb 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