summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-12 19:29:08 +0000
committerGerrit Code Review <review@openstack.org>2019-03-12 19:29:08 +0000
commit16a75d9622c7d0d3a8be533cf1194f6adbe756e5 (patch)
treeeb477bf6465c2fa92339c8fa26aea1e65fc6e0d7
parent8c546dbdd54861ebfae3ff3286e3a0f5651397fe (diff)
parentc3d4a464cb957545f04947be7e82b6771772760d (diff)
Merge "build: support helm-toolkit pinning"
-rwxr-xr-xtools/helm_tk.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index f6ce975..ca4aed8 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -20,6 +20,9 @@ HELM=${1}
20HELM_PIDFILE=${2} 20HELM_PIDFILE=${2}
21SERVE_DIR=$(mktemp -d) 21SERVE_DIR=$(mktemp -d)
22 22
23# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
24HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
25
23${HELM} init --client-only 26${HELM} init --client-only
24 27
25if [[ -s ${HELM_PIDFILE} ]]; then 28if [[ -s ${HELM_PIDFILE} ]]; then
@@ -65,8 +68,9 @@ fi
65 68
66{ 69{
67 cd "${SERVE_DIR}" 70 cd "${SERVE_DIR}"
68 git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true 71 git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
69 cd openstack-helm-infra 72 cd openstack-helm-infra
73 git reset --hard "${HTK_STABLE_COMMIT}"
70 74
71 make helm-toolkit 75 make helm-toolkit
72} 76}