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.

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

Temporarily build 18.2 without AIX and without Windows 10/11 testers #13642

Merged
merged 2 commits into from
Mar 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions .buildkite/build-test-omnibus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ then
fi

# array of all esoteric platforms in the format test-platform:build-platform
esoteric_platforms=("aix-7.1-powerpc:aix-7.1-powerpc" "aix-7.2-powerpc:aix-7.1-powerpc" "aix-7.3-powerpc:aix-7.1-powerpc" "el-7-ppc64:el-7-ppc64" "el-7-ppc64le:el-7-ppc64le" "el-7-s390x:el-7-s390x" "el-8-s390x:el-7-s390x" "freebsd-12-amd64:freebsd-12-amd64" "freebsd-13-amd64:freebsd-12-amd64" "mac_os_x-10.15-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-12-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-arm64:mac_os_x-11-arm64" "mac_os_x-12-arm64:mac_os_x-11-arm64" "solaris2-5.11-i386:solaris2-5.11-i386" "solaris2-5.11-sparc:solaris2-5.11-sparc" "sles-12-s390x:sles-12-s390x" "sles-15-s390x:sles-12-s390x")
esoteric_platforms=("el-7-ppc64:el-7-ppc64" "el-7-ppc64le:el-7-ppc64le" "el-7-s390x:el-7-s390x" "el-8-s390x:el-7-s390x" "freebsd-12-amd64:freebsd-12-amd64" "freebsd-13-amd64:freebsd-12-amd64" "mac_os_x-10.15-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-12-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-arm64:mac_os_x-11-arm64" "mac_os_x-12-arm64:mac_os_x-11-arm64" "solaris2-5.11-i386:solaris2-5.11-i386" "solaris2-5.11-sparc:solaris2-5.11-sparc" "sles-12-s390x:sles-12-s390x" "sles-15-s390x:sles-12-s390x")

omnibus_build_platforms=()
omnibus_test_platforms=()
Expand Down Expand Up @@ -56,16 +56,16 @@ then
done

# remove duplicates from build array
# using shell parameter expansion this checks to make sure the esoteric_build_platforms array isn't empty if OMNIBUS_FILTER is only container platforms
# prevents esoteric_build_platforms unbound variable error
# using shell parameter expansion this checks to make sure the esoteric_build_platforms array isn't empty if OMNIBUS_FILTER is only container platforms
# prevents esoteric_build_platforms unbound variable error
if [[ ! -z "${esoteric_build_platforms:-}" ]]
then
esoteric_build_platforms=($(printf "%s\n" "${esoteric_build_platforms[@]}" | sort -u | tr '\n' ' '))
fi
fi

# using shell parameter expansion this checks to make sure the omnibus_build_platforms array isn't empty if OMNIBUS_FILTER is only esoteric platforms
# prevents omnibus_build_platforms unbound variable error
# using shell parameter expansion this checks to make sure the omnibus_build_platforms array isn't empty if OMNIBUS_FILTER is only esoteric platforms
# prevents omnibus_build_platforms unbound variable error
if [[ ! -z "${omnibus_build_platforms:-}" ]]
then
for platform in ${omnibus_build_platforms[@]}; do
Expand All @@ -90,7 +90,7 @@ then
echo " commands:"
echo " - ./.expeditor/scripts/omnibus_chef_build.sh"
echo " timeout_in_minutes: 60"
else
else
echo "- label: \":hammer_and_wrench::windows: $platform\""
echo " retry:"
echo " automatic:"
Expand Down Expand Up @@ -201,8 +201,8 @@ fi

echo "- wait: ~"

# using shell parameter expansion this checks to make sure the omnibus_test_platforms array isn't empty if OMNIBUS_FILTER is only esoteric platforms
# prevents omnibus_test_platforms unbound variable error
# using shell parameter expansion this checks to make sure the omnibus_test_platforms array isn't empty if OMNIBUS_FILTER is only esoteric platforms
# prevents omnibus_test_platforms unbound variable error
if [[ ! -z "${omnibus_test_platforms:-}" ]]
then
for platform in ${omnibus_test_platforms[@]}; do
Expand Down Expand Up @@ -249,10 +249,10 @@ then
fi

# using shell parameter expansion this checks to make sure the esoteric_test_platforms array isn't empty if OMNIBUS_FILTER is only container platforms
# prevents esoteric_test_platforms unbound variable error
# prevents esoteric_test_platforms unbound variable error
if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] && [[ ! -z "${esoteric_test_platforms:-}" ]]
then

for platform in ${esoteric_test_platforms[@]}; do
build_key=$(echo ${platform#*:} | tr . _)
test_key=$(echo ${platform%:*} | tr . _)
Expand Down Expand Up @@ -306,4 +306,4 @@ then
echo " plugins:"
echo " - chef/omnibus#v0.2.83:"
echo " promote: chef"
fi
fi
12 changes: 6 additions & 6 deletions .expeditor/release.omnibus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ skip-artifactory-platforms:
- freebsd-13-amd64
windows-64-msystem: UCRT64
builder-to-testers-map:
aix-7.1-powerpc:
- aix-7.1-powerpc
- aix-7.2-powerpc
- aix-7.3-powerpc
#aix-7.1-powerpc:
# - aix-7.1-powerpc
# - aix-7.2-powerpc
# - aix-7.3-powerpc
# amazon-2022-aarch64:
# - amazon-2022-aarch64
# amazon-2022-x86_64:
Expand Down Expand Up @@ -87,6 +87,6 @@ builder-to-testers-map:
- windows-2016-x86_64
- windows-2019-x86_64
- windows-2022-x86_64
- windows-10-x86_64
- windows-11-x86_64
#- windows-10-x86_64
#- windows-11-x86_64