From 1ac05c754732f5bf9c7731f1ddc56a1b103985bb Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 8 May 2026 15:19:44 +0200 Subject: [PATCH 1/3] add extract-yaml-job-scripts helper script --- .gitignore | 1 + bin/extract-yaml-job-scripts | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 bin/extract-yaml-job-scripts diff --git a/.gitignore b/.gitignore index 4beb72af2..21421e4fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wikibase-local-ca.crt *.bak +.extracted diff --git a/bin/extract-yaml-job-scripts b/bin/extract-yaml-job-scripts new file mode 100755 index 000000000..025ba3901 --- /dev/null +++ b/bin/extract-yaml-job-scripts @@ -0,0 +1,29 @@ +#!/bin/bash + +if [[ -n "${CI}" ]]; then + set -x +fi + +# absolute path of the wbaas-deploy repository +# shellcheck disable=SC2046,SC2128,2086 +ROOT=$(realpath $(dirname $(realpath $BASH_SOURCE))/..) +EXTRACTED_SCRIPTS_DIR="$ROOT/k8s/jobs/.extracted" + +rm -Rfv "$ROOT/k8s/jobs/.extracted"/*_extracted.sh +mkdir -p "$EXTRACTED_SCRIPTS_DIR" + +for file in "$ROOT"/k8s/jobs/*.yaml; do + BASENAME=$(basename "$file") + TMP_FILE="${EXTRACTED_SCRIPTS_DIR}/${BASENAME}_extracted.sh" + SCRIPT_SHELL=$(cat "$file" | yq '.spec.template.spec.containers[0].command[0]') + + if [[ "$SCRIPT_SHELL" == "null" ]]; then + continue + fi + + SCRIPT=$(cat "$file" | yq '.spec.template.spec.containers[0].command[2]') + echo "#!/usr/bin/env $SCRIPT_SHELL" > "$TMP_FILE" + echo "$SCRIPT" >> "$TMP_FILE" + + echo "extracted $TMP_FILE" +done From c8a5b2d5992e8a5d43dc90213fdad1d12fb55067 Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Mon, 11 May 2026 12:31:47 +0200 Subject: [PATCH 2/3] Update extract-yaml-job-scripts --- bin/extract-yaml-job-scripts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/extract-yaml-job-scripts b/bin/extract-yaml-job-scripts index 025ba3901..fe208fad1 100755 --- a/bin/extract-yaml-job-scripts +++ b/bin/extract-yaml-job-scripts @@ -5,8 +5,7 @@ if [[ -n "${CI}" ]]; then fi # absolute path of the wbaas-deploy repository -# shellcheck disable=SC2046,SC2128,2086 -ROOT=$(realpath $(dirname $(realpath $BASH_SOURCE))/..) +ROOT=$(git rev-parse --show-toplevel) EXTRACTED_SCRIPTS_DIR="$ROOT/k8s/jobs/.extracted" rm -Rfv "$ROOT/k8s/jobs/.extracted"/*_extracted.sh From 3c4185998b0014a09067eac749cc3a33776c2773 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 15 May 2026 15:19:27 +0200 Subject: [PATCH 3/3] format via shfmt --- bin/extract-yaml-job-scripts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/extract-yaml-job-scripts b/bin/extract-yaml-job-scripts index fe208fad1..42c87a041 100755 --- a/bin/extract-yaml-job-scripts +++ b/bin/extract-yaml-job-scripts @@ -12,17 +12,17 @@ rm -Rfv "$ROOT/k8s/jobs/.extracted"/*_extracted.sh mkdir -p "$EXTRACTED_SCRIPTS_DIR" for file in "$ROOT"/k8s/jobs/*.yaml; do - BASENAME=$(basename "$file") - TMP_FILE="${EXTRACTED_SCRIPTS_DIR}/${BASENAME}_extracted.sh" - SCRIPT_SHELL=$(cat "$file" | yq '.spec.template.spec.containers[0].command[0]') + BASENAME=$(basename "$file") + TMP_FILE="${EXTRACTED_SCRIPTS_DIR}/${BASENAME}_extracted.sh" + SCRIPT_SHELL=$(cat "$file" | yq '.spec.template.spec.containers[0].command[0]') - if [[ "$SCRIPT_SHELL" == "null" ]]; then - continue - fi + if [[ "$SCRIPT_SHELL" == "null" ]]; then + continue + fi - SCRIPT=$(cat "$file" | yq '.spec.template.spec.containers[0].command[2]') - echo "#!/usr/bin/env $SCRIPT_SHELL" > "$TMP_FILE" - echo "$SCRIPT" >> "$TMP_FILE" + SCRIPT=$(cat "$file" | yq '.spec.template.spec.containers[0].command[2]') + echo "#!/usr/bin/env $SCRIPT_SHELL" >"$TMP_FILE" + echo "$SCRIPT" >>"$TMP_FILE" - echo "extracted $TMP_FILE" + echo "extracted $TMP_FILE" done