diff options
| author | Sean Simmons <ssimmons@progress.com> | 2023-03-29 10:51:29 -0400 |
|---|---|---|
| committer | Sean Simmons <ssimmons@progress.com> | 2023-03-29 10:51:29 -0400 |
| commit | 5b7492e55b21e060f40cb5b7bb855c10d440d561 (patch) | |
| tree | c38544992a0250e2ff421b7dad80acb6ba25afe9 | |
| parent | 133cb15de8030380de5016a03359037dc3d52ca1 (diff) | |
| download | chef-5b7492e55b21e060f40cb5b7bb855c10d440d561.tar.gz | |
adding sles-15 now that omnitruck is fixed
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 | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index 2256c87e2f..93a3849ef5 100755 --- a/.buildkite/build-test-omnibus.sh +++ b/.buildkite/build-test-omnibus.sh @@ -13,7 +13,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-arm" "ubuntu-2004-arm:ubuntu-2004-arm" "ubuntu-2204-arm:ubuntu-2204-arm" "centos-7-arm:centos-7-arm" "centos-8-arm:centos-8-arm" "sles-12-arm:sles-12-arm" "rhel-9-arm:rhel-9-arm" "amazon-2-arm:amazon-2-arm") +container_platforms_arm64=("ubuntu-1804-arm:ubuntu-1804-arm" "ubuntu-2004-arm:ubuntu-2004-arm" "ubuntu-2204-arm:ubuntu-2204-arm" "centos-7-arm:centos-7-arm" "centos-8-arm:centos-8-arm" "sles-15-arm:sles-15-arm" "rhel-9-arm:rhel-9-arm" "amazon-2-arm:amazon-2-arm") # add rest of windows platforms to tests, if not on chef-oss org if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] diff --git a/.expeditor/scripts/omnibus_chef_build.sh b/.expeditor/scripts/omnibus_chef_build.sh index 751356d3b3..d3438c3e8f 100755 --- a/.expeditor/scripts/omnibus_chef_build.sh +++ b/.expeditor/scripts/omnibus_chef_build.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -ueo pipefail +set -ueox pipefail SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) @@ -12,6 +12,11 @@ export PATH="/opt/omnibus-toolchain/bin:${PATH}" export OMNIBUS_FIPS_MODE="true" export OMNIBUS_PIPELINE_DEFINITION_PATH="${SCRIPT_DIR}/../release.omnibus.yml" +## hard code for sles-aarch64 here +## condition statement that looks at the slug, then do the hard coding to +#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 + + echo "--- Installing Chef Foundation" curl -fsSL https://omnitruck.chef.io/chef/install.sh | bash -s -- -c "current" -P "chef-foundation" -v "$CHEF_FOUNDATION_VERSION" |