From 5a5d318d4a3c7ea1b3605d94ef28b17ccd5d1d6f Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 11 Feb 2025 21:39:40 +0000
Subject: [PATCH] HTK uplift and fix for helm_tk.sh

Update helm_tk script to be able to build unmerged
code.

Change-Id: I037fe74efd1fe03612f266b208ae5cf59faf9fdc
---
 tools/helm_tk.sh | 2 +-
 zuul.d/jobs.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 31860b74..4e4952b4 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -26,7 +26,7 @@ TMP_DIR=$(mktemp -d)
 {
     HTK_REPO_DIR=$TMP_DIR/htk
     git clone "$HTK_REPO" "$HTK_REPO_DIR"
-    (cd "$HTK_REPO_DIR" && git reset --hard "${HTK_STABLE_COMMIT}")
+    (cd "$HTK_REPO_DIR" && git fetch --depth=1 "$HTK_REPO" "$HTK_STABLE_COMMIT" && git checkout FETCH_HEAD)
     cp -r "${HTK_REPO_DIR}/helm-toolkit" charts/deps/
 }
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d79e5c30..209a9789 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -60,7 +60,7 @@
     timeout: 900
     nodeset: airship-promenade-single-node-jammy
     vars:
-      HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
+      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
 
 - job:
     name: airship-promenade-chart-build-gate-latest-htk