starlingx/jenkins-pipelines
Code Issues Proposed changes

New config option: IGNORE_HELM_CHARTS

Browse Source 
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>
This commit is contained in:
Davlet Panech 2024-08-29 14:27:14 -04:00
parent 78f861d29d
commit 1fda7d789e
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/build-helm-charts.sh
View File

@ -14,6 +14,7 @@ require_job_env DRY_RUN
declare_job_env HELM_CHART_NAME declare_job_env HELM_CHART_NAME
declare_job_env HELM_CHART_PACKAGES declare_job_env HELM_CHART_PACKAGES
declare_job_env EXTRA_HELM_CHART_PACKAGES declare_job_env EXTRA_HELM_CHART_PACKAGES
declare_job_env IGNORE_HELM_CHARTS
declare_job_env MANAGED_IMAGE_LIST_FILE declare_job_env MANAGED_IMAGE_LIST_FILE
load_build_env 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[*]}]" 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 # find managed image list file
use_managed_image_list=0 use_managed_image_list=0
rm -rf "$WORKSPACE_ROOT/managed-image-lists" 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+=" --image-record ${image_arg}"
cmd+=" --app $app" cmd+=" --app $app"
cmd+=" --package $pkgs" 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+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/main-${label}.log\""
cmd+=" ; [[ \${PIPESTATUS[0]} -eq 0 ]]" cmd+=" ; [[ \${PIPESTATUS[0]} -eq 0 ]]"
notice "building primary helm chart $app ($label)" notice "building primary helm chart $app ($label)"
@ -242,6 +250,9 @@ for spec in $EXTRA_HELM_CHARTS ; do
cmd+=" --os $DOCKER_BASE_OS" cmd+=" --os $DOCKER_BASE_OS"
cmd+=" --app $app" cmd+=" --app $app"
cmd+=" --package $pkgs" 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\"" cmd+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/$app.log\""
notice "building extra helm chart $app" notice "building extra helm chart $app"
build_helm_charts "$cmd" || exit 1 build_helm_charts "$cmd" || exit 1

7
scripts/templates/build.conf.example.in
View File

@ -250,6 +250,13 @@ HELM_CHART_NAME=
# #
EXTRA_HELM_CHART_PACKAGES= 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 # Directory containing additional image names & tags to be replaced in
# helm charts # helm charts
EXTRA_IMAGE_RECORD_DIR= EXTRA_IMAGE_RECORD_DIR=