summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Simmons <ssimmons@progress.com>2023-03-29 11:38:45 -0400
committerSean Simmons <ssimmons@progress.com>2023-03-29 11:38:45 -0400
commit07438ce7bde2daad1cf595bd87e1ccad9904c977 (patch)
tree0e50e08d2a9497c7e98c9e452114d8d0cb5bb395
parent8f3bbe3d443415b00a52c933d6a75056cdd28462 (diff)
downloadchef-07438ce7bde2daad1cf595bd87e1ccad9904c977.tar.gz
testing with the same array
Signed-off-by: Sean Simmons <ssimmons@progress.com>
-rwxr-xr-x.buildkite/build-test-omnibus.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh
index 0a9d2cf950..fb15b1569f 100755
--- a/.buildkite/build-test-omnibus.sh
+++ b/.buildkite/build-test-omnibus.sh
@@ -12,7 +12,7 @@ FILTER="${OMNIBUS_FILTER:=*}"
# array of all container platforms in the format test-platform:build-platform
container_platforms=("amazon-2:centos-7" "centos-6:centos-6" "centos-7:centos-7" "centos-8:centos-8" "rhel-9:rhel-9" "debian-9:debian-9" "debian-10:debian-9" "debian-11:debian-9" "ubuntu-1604:ubuntu-1604" "ubuntu-1804:ubuntu-1604" "ubuntu-2004:ubuntu-1604" "ubuntu-2204:ubuntu-1604" "sles-15:sles-15" "windows-2019:windows-2019")
-container_platforms_arm64=("ubuntu-1804-arm:ubuntu-1804" "ubuntu-2004:ubuntu-2004" "ubuntu-2204:ubuntu-2204" "centos-7-arm:centos-7" "centos-8-arm:centos-8" "sles-15-arm:sles-15" "rhel-9-arm:rhel-9" "amazon-2-arm:amazon-2")
+# container_platforms_arm64=("ubuntu-1804-arm:ubuntu-1804" "ubuntu-2004:ubuntu-2004" "ubuntu-2204:ubuntu-2204" "centos-7-arm:centos-7" "centos-8-arm:centos-8" "sles-15-arm:sles-15" "rhel-9-arm:rhel-9" "amazon-2-arm:amazon-2")
# add rest of windows platforms to tests, if not on chef-oss org
if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]
@@ -142,9 +142,9 @@ then
done
fi
-if [[ ! -z "${omnibus_build_platforms_arm64:-}" ]]
+if [[ ! -z "${omnibus_build_platforms:-}" ]]
then
- for platform in ${omnibus_build_platforms_arm64[@]}; do
+ for platform in ${omnibus_build_platforms[@]}; do
echo "- label: \":hammer_and_wrench::docker::muscle: $platform-arm\""
echo " retry:"
echo " automatic:"
@@ -345,13 +345,13 @@ then
done
fi
-if [[ ! -z "${omnibus_test_platforms_arm64:-}" ]]
+if [[ ! -z "${omnibus_test_platforms:-}" ]]
then
- for platform in ${omnibus_test_platforms_arm64[@]}; do
+ for platform in ${omnibus_test_platforms[@]}; do
if [[ $platform != *"windows"* ]]; then
echo "- env:"
echo " OMNIBUS_BUILDER_KEY: build-${platform#*:}"
- echo " label: \":mag::docker::muscle: ${platform%:*}\""
+ echo " label: \":mag::docker::muscle: ${platform%:*}-arm\""
echo " key: test-${platform%:*}"
echo " retry:"
echo " automatic:"