Browse Source

build: support helm-toolkit pinning

This pins the version of helm-toolkit used in the build due to
a breaking change in helm-toolkit.

Once helm 2.13.1 is released with this fix [0] we can update to use
it, and update the helm-toolkit pin to "master".

[0]: https://github.com/helm/helm/pull/5411

Change-Id: I7b9085aacc1201baa0bf2ca73f9f2127a646a7b2
changes/68/642568/2
Sean Eagan 2 months ago
parent
commit
d1fca990cf
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      tools/helm_tk.sh

+ 5
- 1
tools/helm_tk.sh View File

@@ -22,6 +22,9 @@ HELM=${1}
22 22
 HELM_PIDFILE=${2}
23 23
 SERVE_DIR=$(mktemp -d)
24 24
 
25
+# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
26
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
27
+
25 28
 ${HELM} init --client-only
26 29
 
27 30
 if [[ -s ${HELM_PIDFILE} ]]; then
@@ -67,8 +70,9 @@ fi
67 70
 
68 71
 {
69 72
     cd "${SERVE_DIR}"
70
-    git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
73
+    git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
71 74
     cd openstack-helm-infra
75
+    git reset --hard "${HTK_STABLE_COMMIT}"
72 76
 
73 77
     make helm-toolkit
74 78
 }

Loading…
Cancel
Save