From: Eric Ball <eball@linuxfoundation.org>
Date: Mon, 25 Jan 2021 20:21:52 +0000 (+0000)
Subject: Merge "Add regex for common-packer var and templates"
X-Git-Tag: v0.60.5
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=89a3197c179eae7b3d8fba46ba2aa74367895eb0;hp=e86e08ddec39452cbd671e527b0b5247efd23b2d;p=releng%2Fglobal-jjb.git

Merge "Add regex for common-packer var and templates"
---

diff --git a/releasenotes/notes/fix-release-job-script-edeb0473e2a9c7cb.yaml b/releasenotes/notes/fix-release-job-script-edeb0473e2a9c7cb.yaml
new file mode 100644
index 00000000..dfb1b71c
--- /dev/null
+++ b/releasenotes/notes/fix-release-job-script-edeb0473e2a9c7cb.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix the release job script to handle LOG_DIR unbound variable
+    and condition to check if the LOGS_SERVER or CDN_URL is being used.
diff --git a/releasenotes/notes/remove-python-27-support-1e109eab35756c0b.yaml b/releasenotes/notes/remove-python-27-support-1e109eab35756c0b.yaml
new file mode 100644
index 00000000..75ff50d3
--- /dev/null
+++ b/releasenotes/notes/remove-python-27-support-1e109eab35756c0b.yaml
@@ -0,0 +1,15 @@
+---
+fixes:
+  - |
+    Remove python 2.7 support
+
+    As per the deprecation notice python 2.7 is not long supported.
+    This causing job failures since the dependencies install
+    are not maintained.
+
+    DEPRECATION: Python 2.7 reached the end of its life on January 1st,
+    2020. Please upgrade your Python as Python 2.7 is no longer
+    maintained. pip 21.0 will drop support for Python 2.7 in January
+    2021. More details about Python 2 support in pip can be found at
+    https://pip.pypa.io/en/latest/development/release-process/#python-2-support
+    pip 21.0 will remove support for this functionality.
diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index bf9b12ee..062beb56 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -50,14 +50,6 @@ EOF
        fi
     fi
 
-    #Project may still want to use system py27
-    #pip and setuptools must be updated for py27 to work.
-    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
-
     python3 -m pip install --user --quiet --upgrade pip
     python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
     python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
diff --git a/shell/release-job.sh b/shell/release-job.sh
index 7ac6fc58..9ff67994 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -25,7 +25,7 @@ python -m pip freeze
 
 set_variables_common(){
     echo "INFO: Setting common variables"
-    if [[ -z ${LOGS_SERVER:-} ]] || [[ -z ${CDN_URL:-} ]]; then
+    if [[ -z ${LOGS_SERVER:-} ]] && [[ -z ${CDN_URL:-} ]]; then
         echo "ERROR: LOGS_SERVER or CDN_URL not defined"
         exit 1
     fi
@@ -48,6 +48,9 @@ set_variables_common(){
         release_file="None"
     fi
 
+    if [[ -z ${LOG_DIR:-} ]]; then
+        LOG_DIR=$(yq -r ".log_dir" "$release_file")
+    fi
     if [[ -n ${LOGS_SERVER:-} ]]; then
         logs_url="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
     elif [[ -n ${CDN_URL:-} ]]; then