From 77c0e6a7d44f0f1dbda8f19794e5f2cbd390b408 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Sun, 28 Feb 2021 06:30:13 +0000
Subject: [PATCH] Fix gates (helm install, xenial image)

* skip the repository update when running 'helm init'
* install pip < 21 in xenial dockerfile

Change-Id: I0ab40dc371b5632d8d4c11899b6340ade2b82455
---
 images/armada/Dockerfile.ubuntu_xenial | 2 +-
 tools/helm_tk.sh                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/armada/Dockerfile.ubuntu_xenial b/images/armada/Dockerfile.ubuntu_xenial
index e94653f5..08e0a4c9 100644
--- a/images/armada/Dockerfile.ubuntu_xenial
+++ b/images/armada/Dockerfile.ubuntu_xenial
@@ -69,7 +69,7 @@ RUN set -ex \
     && make install \
     && cd .. \
     && rm -fr libyaml \
-    && python3 -m pip install -U pip \
+    && python3 -m pip install -U 'pip<21.0' \
     && pip3 install -r requirements.txt --no-cache-dir \
     && apt-get purge -y --auto-remove $buildDeps \
     && apt-get autoremove -yqq --purge \
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index ef8dcb92..d8100730 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -24,7 +24,7 @@ SERVE_DIR=$(mktemp -d)
 
 HTK_STABLE_COMMIT=${HTK_COMMIT:-"4fe6212dad6e3f07d43122485d60ab8f38642293"}
 
-${HELM} init --client-only
+${HELM} init --client-only --skip-refresh
 
 if [[ -s ${HELM_PIDFILE} ]]; then
     HELM_PID=$(cat "${HELM_PIDFILE}")