From 64c7d012b1373b076c2af89131fa4b0f0e766bd0 Mon Sep 17 00:00:00 2001
From: "Mahmoudi, Ahmad (am495p)" <ahmad.mahmoudi@att.com>
Date: Tue, 23 Jun 2020 19:46:27 +0000
Subject: [PATCH] (fix) Add task to install pip3

Added task to install pip3 to adress the airhsip-shipyard zuul gate issue
where airship-shipyard-airskiff-deployment job fails on:
sudo -H -E pip install 'cmd2<=0.8.7'
sudo: pip: command not found

Updated pip to pip3 to move tom pip to pip3.
Also, updated the openstack-helm-infra commit-id to the latest to use
pip3 instead of pip.

Change-Id: I0d4aef4de3c10a9317acad8c8c9e17e15b309172
---
 .../deployment/airskiff/developer/000-clone-dependencies.sh | 2 +-
 tools/deployment/airskiff/developer/020-setup-client.sh     | 4 ++--
 tools/gate/playbooks/airskiff-deploy-gate.yaml              | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/airskiff/developer/000-clone-dependencies.sh b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
index a2db907fc..35ae6928b 100755
--- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
@@ -19,7 +19,7 @@ set -xe
 
 CURRENT_DIR="$(pwd)"
 : "${INSTALL_PATH:="../"}"
-: "${OSH_INFRA_COMMIT:="eacf93722136636dcfbd2b68c59b71f071ffc085"}"
+: "${OSH_INFRA_COMMIT:="a31bb2b04918107a08cb14201ae72f2b5696cb9d"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"
diff --git a/tools/deployment/airskiff/developer/020-setup-client.sh b/tools/deployment/airskiff/developer/020-setup-client.sh
index fa9043f20..239ad1ce4 100755
--- a/tools/deployment/airskiff/developer/020-setup-client.sh
+++ b/tools/deployment/airskiff/developer/020-setup-client.sh
@@ -18,8 +18,8 @@
 set -xe
 
 # Install OpenStack client and create OpenStack client configuration file.
-sudo -H -E pip install "cmd2<=0.8.7"
-sudo -H -E pip install python-openstackclient python-heatclient
+sudo -H -E pip3 install "cmd2<=0.8.7"
+sudo -H -E pip3 install python-openstackclient python-heatclient
 
 sudo -H mkdir -p /etc/openstack
 sudo -H chown -R "$(id -un)": /etc/openstack
diff --git a/tools/gate/playbooks/airskiff-deploy-gate.yaml b/tools/gate/playbooks/airskiff-deploy-gate.yaml
index c037b5b33..034890d83 100644
--- a/tools/gate/playbooks/airskiff-deploy-gate.yaml
+++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml
@@ -23,6 +23,12 @@
         daemon_reload: yes
         name: systemd-resolved
       become: yes
+    - name: ensure pip3 installed
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - python3-pip
+      become: yes
 
     - name: Clone dependencies
       shell: |