diff options
| author | Sean Simmons <ssimmons@progress.com> | 2023-03-28 12:43:53 -0400 |
|---|---|---|
| committer | Sean Simmons <ssimmons@progress.com> | 2023-03-28 12:43:53 -0400 |
| commit | c4614971c50b1b08063950c6e6ff254024afe673 (patch) | |
| tree | b16e2d607add5f849c89408dac078196f0ae9083 | |
| parent | cfa0d9aa1d6f26cf4ef32e9bdb76fa9f704b59ab (diff) | |
| download | chef-c4614971c50b1b08063950c6e6ff254024afe673.tar.gz | |
testing windows builds, and undoing the sles 15 arm
Signed-off-by: Sean Simmons <ssimmons@progress.com>
| -rwxr-xr-x | .buildkite/build-test-omnibus.sh | 2 | ||||
| -rwxr-xr-x | .expeditor/scripts/omnibus_chef_build.sh | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index 5629a0727a..3f2036a751 100755 --- a/.buildkite/build-test-omnibus.sh +++ b/.buildkite/build-test-omnibus.sh @@ -11,7 +11,7 @@ fi 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=("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" "windows-2012:windows-2019" "windows-2012r2:windows-2019" "windows-2016:windows-2019" "windows-2022:windows-2019" "windows-10:windows-2019" "windows-11:windows-2019") container_platforms_arm64=("ubuntu-1804-arm:ubuntu-1804" "ubuntu-2004-arm:ubuntu-2004" "ubuntu-2204-arm:ubuntu-2204" "sles-15-arm:sles-12" "centos-7-arm:centos-7" "centos-8-arm:centos-8" "rhel-9-arm:rhel-9" "amazon-2-arm:amazon-2") diff --git a/.expeditor/scripts/omnibus_chef_build.sh b/.expeditor/scripts/omnibus_chef_build.sh index cd4a223d2a..751356d3b3 100755 --- a/.expeditor/scripts/omnibus_chef_build.sh +++ b/.expeditor/scripts/omnibus_chef_build.sh @@ -12,13 +12,8 @@ export PATH="/opt/omnibus-toolchain/bin:${PATH}" export OMNIBUS_FIPS_MODE="true" export OMNIBUS_PIPELINE_DEFINITION_PATH="${SCRIPT_DIR}/../release.omnibus.yml" -if [[ "$BUILDKITE_STEP_KEY" = "build-sles-15-arm"]]; then - echo "--- Installing Chef Foundation for sles-15-arm" - curl -fsSL https://artifactory-internal.ps.chef.co/artifactory/omnibus-current-local/com/getchef/chef-foundation/3.0.6/sles/15/chef-foundation-3.0.6-1.sles15.aarch64.rpm | rpm -i chef-foundation-3.0.6-1.sles15.aarch64.rpm - else - echo "--- Installing Chef Foundation" - curl -fsSL https://omnitruck.chef.io/chef/install.sh | bash -s -- -c "current" -P "chef-foundation" -v "$CHEF_FOUNDATION_VERSION" -fi +echo "--- Installing Chef Foundation" +curl -fsSL https://omnitruck.chef.io/chef/install.sh | bash -s -- -c "current" -P "chef-foundation" -v "$CHEF_FOUNDATION_VERSION" if [[ -f "/opt/omnibus-toolchain/embedded/ssl/certs/cacert.pem" ]]; then export SSL_CERT_FILE="/opt/omnibus-toolchain/embedded/ssl/certs/cacert.pem" |