Skip to content

capi: isolate Azure CI CLI auth per SIG build #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubernetes-prow merged 2 commits into from
Jul 3, 2026
Merged

capi: isolate Azure CI CLI auth per SIG build #2086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8262463
capi: isolate Azure CI CLI auth per SIG build
MaxRink Jun 28, 2026
0e22fc7
capi: quote Azure SIG wait pids
MaxRink Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions images/capi/scripts/ci-azure-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ get_random_cvm_region() {

export PATH=${PWD}/.local/bin:$PATH
export PATH=${PYTHON_BIN_DIR:-"/root/.local/bin"}:$PATH
export AZURE_CONFIG_DIR="${AZURE_CONFIG_DIR:-${ARTIFACTS}/azure-cli/main}"
mkdir -p "${AZURE_CONFIG_DIR}"

export AZURE_LOCATION="${AZURE_LOCATION:-$(get_random_region)}"
export RESOURCE_GROUP_NAME="image-builder-e2e-$(head /dev/urandom | LC_ALL=C tr -dc a-z0-9 | head -c 6 ; echo '')"
Expand Down Expand Up @@ -117,11 +119,22 @@ export FLATCAR_VERSION="$(get_flatcar_version)"
# Disable them for CI runs so don't run into timeouts
export PACKER_VAR_FILES="packer/azure/scripts/disable-windows-prepull.json scripts/ci-disable-goss-inspect.json"

run_sig_target() {
local target="$1"
local location="${2:-${AZURE_LOCATION}}"

export AZURE_CONFIG_DIR="${ARTIFACTS}/azure-cli/${target}"
export AZURE_LOCATION="${location}"
mkdir -p "${AZURE_CONFIG_DIR}"

login
make "build-azure-sig-${target}"
}

declare -A PIDS
for target in ${SIG_CI_TARGETS[@]};
for target in "${SIG_CI_TARGETS[@]}";
do
login
make build-azure-sig-${target} > ${ARTIFACTS}/azure-sigs/${target}.log 2>&1 &
run_sig_target "${target}" > "${ARTIFACTS}/azure-sigs/${target}.log" 2>&1 &
PIDS["sig-${target}"]=$!
done

Expand All @@ -132,19 +145,17 @@ if [[ ! " ${VALID_CVM_LOCATIONS[*]} " =~ " ${SELECTED_LOCATION} " ]]; then
echo "Selected location is ${SELECTED_LOCATION}."
fi

for target in ${SIG_CVM_CI_TARGETS[@]};
for target in "${SIG_CVM_CI_TARGETS[@]}";
do
login
AZURE_LOCATION="${SELECTED_LOCATION}" make build-azure-sig-${target} > ${ARTIFACTS}/azure-sigs/${target}.log 2>&1 &
run_sig_target "${target}" "${SELECTED_LOCATION}" > "${ARTIFACTS}/azure-sigs/${target}.log" 2>&1 &
PIDS["sig-${target}"]=$!
done

# need to unset errexit so that failed child tasks don't cause script to exit
set +o errexit
exit_err=false
for target in "${!PIDS[@]}"; do
wait ${PIDS[$target]}
if [[ $? -ne 0 ]]; then
if ! wait "${PIDS[$target]}"; then
exit_err=true
echo "${target}: FAILED. See logs in the artifacts folder."
else
Expand Down