From 1fda7d789efaee4fc8452018361a044e9b71bdf7 Mon Sep 17 00:00:00 2001
From: Davlet Panech <davlet.panech@windriver.com>
Date: Thu, 29 Aug 2024 14:27:14 -0400
Subject: [PATCH] New config option: IGNORE_HELM_CHARTS

Add an option IGNORE_HELM_CHARTS to be passed to
  build-helm-charts.sh --ignore <...>"

Closes-Bug: 2077759
Depends-On: https://review.opendev.org/c/starlingx/root/+/927423
Change-Id: I5343ae791bf6820cf537a6a5c453834094435558
Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
---
 scripts/build-helm-charts.sh            | 11 +++++++++++
 scripts/templates/build.conf.example.in |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/scripts/build-helm-charts.sh b/scripts/build-helm-charts.sh
index 51288bc..7d46d07 100755
--- a/scripts/build-helm-charts.sh
+++ b/scripts/build-helm-charts.sh
@@ -14,6 +14,7 @@ require_job_env DRY_RUN
 declare_job_env HELM_CHART_NAME
 declare_job_env HELM_CHART_PACKAGES
 declare_job_env EXTRA_HELM_CHART_PACKAGES
+declare_job_env IGNORE_HELM_CHARTS
 declare_job_env MANAGED_IMAGE_LIST_FILE
 
 load_build_env
@@ -126,6 +127,10 @@ EXTRA_HELM_CHARTS=$(
 )
 info "found extra helm charts: [$(echo ${EXTRA_HELM_CHARTS})] pattern=[${EXTRA_HELM_CHART_PKG_PATTERNS[*]}]"
 
+if [[ -n "$IGNORE_HELM_CHARTS" ]] ; then
+    info "IGNORE_HELM_CHARTS=$IGNORE_HELM_CHARTS"
+fi
+
 # find managed image list file
 use_managed_image_list=0
 rm -rf "$WORKSPACE_ROOT/managed-image-lists"
@@ -222,6 +227,9 @@ if [[ ( "${#image_dirs[@]}" -gt 0 || "$use_managed_image_list" -eq 1 ) && -n "${
                     cmd+=" --image-record ${image_arg}"
                     cmd+=" --app $app"
                     cmd+=" --package $pkgs"
+                    if [[ -n "$IGNORE_HELM_CHARTS" ]] ; then
+                        cmd+=" --ignore='$IGNORE_HELM_CHARTS'"
+                    fi
                     cmd+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/main-${label}.log\""
                     cmd+=" ; [[ \${PIPESTATUS[0]} -eq 0 ]]"
                     notice "building primary helm chart $app ($label)"
@@ -242,6 +250,9 @@ for spec in $EXTRA_HELM_CHARTS ; do
     cmd+=" --os $DOCKER_BASE_OS"
     cmd+=" --app $app"
     cmd+=" --package $pkgs"
+    if [[ -n "$IGNORE_HELM_CHARTS" ]] ; then
+        cmd+=" --ignore='$IGNORE_HELM_CHARTS'"
+    fi
     cmd+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/$app.log\""
     notice "building extra helm chart $app"
     build_helm_charts "$cmd" || exit 1
diff --git a/scripts/templates/build.conf.example.in b/scripts/templates/build.conf.example.in
index bc0a597..31b36cb 100644
--- a/scripts/templates/build.conf.example.in
+++ b/scripts/templates/build.conf.example.in
@@ -250,6 +250,13 @@ HELM_CHART_NAME=
 #
 EXTRA_HELM_CHART_PACKAGES=
 
+#
+# Space or comma-separated list of helm charts to exclude
+#
+# This will be passed to "build-helm-charts.sh --ignore <...>"
+#
+IGNORE_HELM_CHARTS=
+
 # Directory containing additional image names & tags to be replaced in
 # helm charts
 EXTRA_IMAGE_RECORD_DIR=