Merge "The openstack-cron job email report."

diff --git a/releasenotes/notes/fix-capture-instance-metadata-script-e130cc297c189976.yaml b/releasenotes/notes/fix-capture-instance-metadata-script-e130cc297c189976.yaml
new file mode 100644 (file)
index 0000000..3ba334c
--- /dev/null
+++ b/releasenotes/notes/fix-capture-instance-metadata-script-e130cc297c189976.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Check condition when ${NOMAD_DC} is undefined or unset
+
+    Check if the environment variable $NOMAD_DC is not defined or unset,
+    this avoids the script from exiting without capturing instance
+    metadata.

diff --git a/releasenotes/notes/mktemp-busybox-compat-6fc10440960db8c4.yaml b/releasenotes/notes/mktemp-busybox-compat-6fc10440960db8c4.yaml
new file mode 100644 (file)
index 0000000..91bd93a
--- /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/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index cb0081f..23a9f2b 100644 (file)
--- a/shell/capture-instance-metadata.sh
+++ b/shell/capture-instance-metadata.sh
@@ -12,7 +12,7 @@
 echo "---> capture-instance-metadata.sh"
 
 # detect if we're in EC2
-if [ -z "${NOMAD_DC}" ]; then
+if [ -n "${NOMAD_DC}" ]; then
     echo "INFO: Running in Nomad, no metadata"
     exit 0
 fi

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index adcca1c..bf1cf8e 100644 (file)
--- 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
@@ -56,8 +56,19 @@ EOF
     python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
     # installs are silent, show version details in log
     python3 --version
+
     python3 -m pip --version
     python3 -m pip freeze
+
+    #workaround
+    #system tox is py2.7 needs updated pip and setuptools.
+    #this needs to be fixed in packer. tox is py3 on my machine
+    python -m pip install --user --quiet --upgrade pip
+    python -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
+    python --version
+    python -m pip --version
+    python -m pip freeze
+
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
 fi

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 3ad4530..1c1b570 100644 (file)
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -11,12 +11,12 @@
 echo "---> release-job.sh"
 set -eu -o pipefail
 
-echo "INFO: creating virtual environment"
-virtualenv -p python3 /tmp/venv
-PATH=/tmp/venv/bin:$PATH
-pipup="python -m pip install -q --upgrade pip idna==2.8 lftools jsonschema twine yq"
-echo "INFO: $pipup"
-$pipup
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv lftools pip idna==2.8 lftools jsonschema twine yq readline
+
 # show installed versions
 python -m pip --version
 python -m pip freeze

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 9ad3329..78716b0 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -28,11 +28,8 @@ if [[ -f /etc/lsb-release ]]; then
 fi
 
 if [[ $done != "True" ]]; then
-    if [[ $PYTHON == "python2" ]]; then
-        $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-    else
-        $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
-    fi
+        python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp more-itertools~=5.0.0
+        python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
 fi
 
 # installs are silent, show version details in log