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

Add rest of windows platforms to be tested on; Fixing syntax issue in build-test-omnibus #13565

Merged
merged 7 commits into from Feb 14, 2023
Merged

Add rest of windows platforms to be tested on; Fixing syntax issue in build-test-omnibus #13565

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3be52f6
Fixing spacing on promote/create-build-record steps
jesseprieur Feb 7, 2023
49ac893
Adding rest of windows platforms to test on
jesseprieur Feb 7, 2023
d48a2b8
Changing windows platforms to only test 2019 on a default agent in ch…
jesseprieur Feb 8, 2023
07b10a2
Adding key to test steps in pipeline
jesseprieur Feb 8, 2023
4ac61dc
Only set secrets on non-test steps
jesseprieur Feb 8, 2023
999fb12
remove caching plugin
evanahlberg Feb 9, 2023
8dcee93
remove windows 8 from chef-18 pipeline
evanahlberg Feb 13, 2023
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
24 changes: 18 additions & 6 deletions .buildkite/build-test-omnibus.sh
View file
Open in desktop
Expand Up @@ -11,6 +11,12 @@ 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")

# add rest of windows platforms to tests, if not on chef-oss org
if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]
then
container_platforms=( "${container_platforms[@]}" "windows-2012:windows-2019" "windows-2012r2:windows-2019" "windows-2016:windows-2019" "windows-2022:windows-2019" "windows-8:windows-2019" "windows-10:windows-2019" "windows-11:windows-2019" )
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")

Expand Down Expand Up @@ -190,7 +196,7 @@ then
echo " label: \":artifactory: Create Build Record\""
echo " plugins:"
echo " - chef/omnibus#v0.2.83:"
echo " create-build-record: chef"
echo " create-build-record: chef"
fi

echo "- wait: ~"
Expand All @@ -204,6 +210,7 @@ then
echo "- env:"
echo " OMNIBUS_BUILDER_KEY: build-${platform#*:}"
echo " label: \":mag::docker: ${platform%:*}\""
echo " key: test-${platform%:*}"
echo " retry:"
echo " automatic:"
echo " limit: 1"
Expand All @@ -220,14 +227,19 @@ then
echo " timeout_in_minutes: 60"
else
echo "- env:"
echo " OMNIBUS_BUILDER_KEY: build-windows-2019"
echo " key: test-windows-2019"
echo ' label: ":mag::windows: windows-2019"'
echo " OMNIBUS_BUILDER_KEY: build-${platform#*:}"
echo " label: \":mag::windows: ${platform%:*}\""
echo " key: test-${platform%:*}"
echo " retry:"
echo " automatic:"
echo " limit: 1"
echo " agents:"
echo " queue: default-windows-2019-privileged"
if [ $BUILDKITE_ORGANIZATION_SLUG == "chef-oss" ]
then
echo " queue: default-${platform%:*}-privileged"
else
echo " queue: omnibus-${platform%:*}-x86_64"
fi
echo " commands:"
echo " - ./.expeditor/scripts/download_built_omnibus_pkgs.ps1"
echo " - ./omnibus/omnibus-test.ps1"
Expand Down Expand Up @@ -293,5 +305,5 @@ then
echo " label: \":artifactory: Promote to Current\""
echo " plugins:"
echo " - chef/omnibus#v0.2.83:"
echo " promote: chef"
echo " promote: chef"
fi
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-command
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ if [[ "$BUILDKITE_BRANCH" != "main" ]]; then
fi

# Only if on chef-canary or chef org
if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]]; then
if [[ ! "$BUILDKITE_STEP_KEY" =~ ^test.* ]] && [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]]; then

export VAULT_ADDR="https://vault.ps.chef.co"
export VAULT_TOKEN=$(vault login -method=aws -path=aws/private-cd -token-only header_value=vault.ps.chef.co role=ci)
Expand Down
18 changes: 9 additions & 9 deletions .buildkite/verify.pipeline.sh
View file
Open in desktop
Expand Up @@ -96,10 +96,10 @@ for gem in ${external_gems[@]}; do
echo " - CHEF_FS=true"
fi
echo " propagate-environment: true"
echo " - chef/cache#v1.5.0:"
echo " s3_bucket: core-buildkite-cache-chef-oss-prod"
echo " cached_folders:"
echo " - vendor"
# echo " - chef/cache#v1.5.0:"
# echo " s3_bucket: core-buildkite-cache-chef-oss-prod"
# echo " cached_folders:"
# echo " - vendor"
echo " timeout_in_minutes: 60"
echo " commands:"
echo " - .expeditor/scripts/bk_container_prep.sh"
Expand Down Expand Up @@ -153,11 +153,11 @@ for plan in ${habitat_plans[@]}; do
else
echo " queue: single-use-privileged"
fi
echo " plugins:"
echo " - chef/cache#v1.5.0:"
echo " s3_bucket: core-buildkite-cache-chef-oss-prod"
echo " cached_folders:"
echo " - vendor"
# echo " plugins:"
# echo " - chef/cache#v1.5.0:"
# echo " s3_bucket: core-buildkite-cache-chef-oss-prod"
# echo " cached_folders:"
# echo " - vendor"
echo " timeout_in_minutes: 60"
echo " commands:"
if [ $plan == "windows" ]
Expand Down