From 6c812c8567cfe7885c3037353d1b579f5214557a Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Mon, 3 Oct 2022 11:16:34 -0600
Subject: [PATCH] Remove old build targets from Azure test matrix

---
 images/capi/azure_targets.sh        |  3 +++
 images/capi/scripts/ci-azure-e2e.sh | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/images/capi/azure_targets.sh b/images/capi/azure_targets.sh
index f842552f7a..fba1f6d88d 100644
--- a/images/capi/azure_targets.sh
+++ b/images/capi/azure_targets.sh
@@ -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"
diff --git a/images/capi/scripts/ci-azure-e2e.sh b/images/capi/scripts/ci-azure-e2e.sh
index ab6f7f398f..ff6293d6b6 100755
--- a/images/capi/scripts/ci-azure-e2e.sh
+++ b/images/capi/scripts/ci-azure-e2e.sh
@@ -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
@@ -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}"]=$!