Skip to content
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

Jump to bottom

Remove old build targets from Azure test matrix #989

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Remove old build targets from Azure test matrix #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions images/capi/azure_targets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VHD_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd"
VHD_CI_TARGETS="ubuntu-2004 centos-7 windows-2019-containerd windows-2022-containerd"
SIG_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd flatcar"
SIG_CI_TARGETS="ubuntu-2004 centos-7 windows-2019-containerd windows-2022-containerd flatcar"
SIG_GEN2_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 flatcar"
SIG_GEN2_CI_TARGETS="ubuntu-2004 centos-7 flatcar"
14 changes: 7 additions & 7 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 @@ -35,14 +35,14 @@ mkdir -p "${ARTIFACTS}/azure-sigs" "${ARTIFACTS}/azure-vhds"
source azure_targets.sh

# Convert single line entries into arrays
IFS=' ' read -r -a VHD_TARGETS <<< "${VHD_TARGETS}"
IFS=' ' read -r -a SIG_TARGETS <<< "${SIG_TARGETS}"
IFS=' ' read -r -a SIG_GEN2_TARGETS <<< "${SIG_GEN2_TARGETS}"
IFS=' ' read -r -a VHD_CI_TARGETS <<< "${VHD_CI_TARGETS}"
IFS=' ' read -r -a SIG_CI_TARGETS <<< "${SIG_CI_TARGETS}"
IFS=' ' read -r -a SIG_GEN2_CI_TARGETS <<< "${SIG_GEN2_CI_TARGETS}"

# Append the "gen2" targets to the original SIG list
for element in "${SIG_GEN2_TARGETS[@]}"
for element in "${SIG_GEN2_CI_TARGETS[@]}"
do
SIG_TARGETS+=("${element}-gen2")
SIG_CI_TARGETS+=("${element}-gen2")
done

# shellcheck source=parse-prow-creds.sh
Expand Down Expand Up @@ -84,13 +84,13 @@ export PACKER_VAR_FILES="packer/azure/scripts/disable-windows-prepull.json scrip

declare -A PIDS
if [[ "${AZURE_BUILD_FORMAT:-vhd}" == "sig" ]]; then
for target in ${SIG_TARGETS[@]};
for target in ${SIG_CI_TARGETS[@]};
do
make build-azure-sig-${target} > ${ARTIFACTS}/azure-sigs/${target}.log 2>&1 &
PIDS["sig-${target}"]=$!
done
else
for target in ${VHD_TARGETS[@]};
for target in ${VHD_CI_TARGETS[@]};
do
make build-azure-vhd-${target} > ${ARTIFACTS}/azure-vhds/${target}.log 2>&1 &
PIDS["vhd-${target}"]=$!
Expand Down