diff options
| author | Sean Simmons <ssimmons@progress.com> | 2023-03-28 12:19:24 -0400 |
|---|---|---|
| committer | Sean Simmons <ssimmons@progress.com> | 2023-03-28 12:19:24 -0400 |
| commit | cfa0d9aa1d6f26cf4ef32e9bdb76fa9f704b59ab (patch) | |
| tree | bba25e6daa57eb15e84851b7ecaf707d07159bd8 | |
| parent | 06b6f0353605b092e29596adaf5cde70700e018c (diff) | |
| download | chef-cfa0d9aa1d6f26cf4ef32e9bdb76fa9f704b59ab.tar.gz | |
attempting hard code for sles-15-arm
Signed-off-by: Sean Simmons <ssimmons@progress.com>
| -rwxr-xr-x | .buildkite/build-test-omnibus.sh | 4 | ||||
| -rwxr-xr-x | .expeditor/scripts/omnibus_chef_build.sh | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index 90303fd8b5..5629a0727a 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" "ubuntu-2004-arm:ubuntu-2004" "ubuntu-2204-arm:ubuntu-2204" "sles-12-arm:sles-15" "centos-7-arm:centos-7" "centos-8-arm:centos-8" "rhel-9-arm:rhel-9" "amazon-2-arm:amazon-2") +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") # add rest of windows platforms to tests, if not on chef-oss org if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] @@ -353,7 +353,7 @@ then echo "- env:" echo " OMNIBUS_BUILDER_KEY: build-${platform#*:}" echo " label: \":mag::docker::muscle: ${platform%:*}\"" - echo " key: test-${platform%:*}-arm" + echo " key: test-${platform%:*}" echo " retry:" echo " automatic:" echo " limit: 1" diff --git a/.expeditor/scripts/omnibus_chef_build.sh b/.expeditor/scripts/omnibus_chef_build.sh index 751356d3b3..cd4a223d2a 100755 --- a/.expeditor/scripts/omnibus_chef_build.sh +++ b/.expeditor/scripts/omnibus_chef_build.sh @@ -12,8 +12,13 @@ export PATH="/opt/omnibus-toolchain/bin:${PATH}" export OMNIBUS_FIPS_MODE="true" export OMNIBUS_PIPELINE_DEFINITION_PATH="${SCRIPT_DIR}/../release.omnibus.yml" -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 [[ "$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 if [[ -f "/opt/omnibus-toolchain/embedded/ssl/certs/cacert.pem" ]]; then export SSL_CERT_FILE="/opt/omnibus-toolchain/embedded/ssl/certs/cacert.pem" |