From 8f368650d05978aac903ade440cf80db215716f6 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Tue, 26 Jan 2021 09:47:13 +0900
Subject: [PATCH] Use a dedicated version of get-pip.py for python 2.7

get-pip.py dropped python 2.7 support, so we cannot use the default
get-pip.py for python 2.7 now. get-pip.py for python 2.7 is available
at https://bootstrap.pypa.io/2.7/get-pip.py.
This commit tries to use python 2.7 version of get-pip.py
for python 2.7 environment.

get-pip.py fails with in tempest-full-py3 job, too, as that job uses
python 3.5 which is also not supported by the new get-pip.py. For py35
the supported get-pip.py link is:
https://bootstrap.pypa.io/3.5/get-pip.py (which contains pip 20.3.4).
Also, we have to invalidate the CI cache which serves py36 pip.
This patch simply renames the file to fail the match.

Change-Id: I88ba370de8887a05c473fe7c19a61a319e8812d2
(cherry picked from commit 1382e933c5b2c16b276e8813fbc7cd9a1d6d4499)
(cherry picked from commit 469b26f74288b00f3b6128f3a260046ea51c8a43)
(cherry picked from commit 910f00eeeb9bcf998d7d39d68387f5ca5be83245)
---
 tools/install_pip.sh | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index dbe52782a4..0a43bf5cb6 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -37,8 +37,10 @@ FILES=$TOP_DIR/files
 # unreliable in CI situations.
 # [1] http://git.openstack.org/cgit/openstack-infra/project-config/tree/nodepool/elements/cache-devstack/source-repository-pip
 
-PIP_GET_PIP_URL=${PIP_GET_PIP_URL:-"https://bootstrap.pypa.io/get-pip.py"}
-LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL)"
+PIP_GET_PIP_URL=${PIP_GET_PIP_URL:-"https://bootstrap.pypa.io/3.5/get-pip.py"}
+PIP_GET_PIP_PY27_URL=${PIP_GET_PIP_PY27_URL:-"https://bootstrap.pypa.io/2.7/get-pip.py"}
+LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL).old"
+LOCAL_PIP_PY27="${LOCAL_PIP}-py27"
 
 GetDistro
 echo "Distro: $DISTRO"
@@ -56,13 +58,17 @@ function get_versions {
 }
 
 
-function install_get_pip {
+function _install_get_pip {
+    local interpreter=$1
+    local pip_get_pip_url=$2
+    local local_pip=$3
+
     # If get-pip.py isn't python, delete it. This was probably an
     # outage on the server.
-    if [[ -r $LOCAL_PIP ]]; then
-        if ! head -1 $LOCAL_PIP | grep -q '#!/usr/bin/env python'; then
-            echo "WARNING: Corrupt $LOCAL_PIP found removing"
-            rm $LOCAL_PIP
+    if [[ -r $local_pip ]]; then
+        if ! head -1 $local_pip | grep -q '#!/usr/bin/env python'; then
+            echo "WARNING: Corrupt $local_pip found removing"
+            rm $local_pip
         fi
     fi
 
@@ -76,22 +82,27 @@ function install_get_pip {
     # Thus we use curl's "-z" feature to always check the modified
     # since and only download if a new version is out -- but only if
     # it seems we downloaded the file originally.
-    if [[ ! -r $LOCAL_PIP || -r $LOCAL_PIP.downloaded ]]; then
+    if [[ ! -r $local_pip || -r $local_pip.downloaded ]]; then
         # only test freshness if LOCAL_PIP is actually there,
         # otherwise we generate a scary warning.
         local timecond=""
-        if [[ -r $LOCAL_PIP ]]; then
-            timecond="-z $LOCAL_PIP"
+        if [[ -r $local_pip ]]; then
+            timecond="-z $local_pip"
         fi
 
         curl -f --retry 6 --retry-delay 5 \
-            $timecond -o $LOCAL_PIP $PIP_GET_PIP_URL || \
+            $timecond -o $local_pip $pip_get_pip_url || \
             die $LINENO "Download of get-pip.py failed"
-        touch $LOCAL_PIP.downloaded
+        touch $local_pip.downloaded
     fi
-    sudo -H -E python $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
+    sudo -H -E $interpreter $local_pip -c $TOOLS_DIR/cap-pip.txt
+}
+
+
+function install_get_pip {
+    _install_get_pip python $PIP_GET_PIP_PY27_URL $LOCAL_PIP_PY27
     if python3_enabled; then
-        sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP -c $TOOLS_DIR/cap-pip.txt
+        _install_get_pip python${PYTHON3_VERSION} $PIP_GET_PIP_URL $LOCAL_PIP
     fi
 }