diff options
| author | Sean Simmons <ssimmons@progress.com> | 2023-02-16 16:46:19 -0500 |
|---|---|---|
| committer | Sean Simmons <ssimmons@progress.com> | 2023-02-16 16:46:19 -0500 |
| commit | 40790a5f15c7610385d6870bd1eca61662335193 (patch) | |
| tree | 6ddb475c93f71efb19202ab1f2a12d0cd7204dfa | |
| parent | a8f4209d66294ae0fe9c0773db223310d6d9b480 (diff) | |
| download | chef-40790a5f15c7610385d6870bd1eca61662335193.tar.gz | |
adding the newest version of omnibus-buildkite-version as a var
and updated the version to address the nightly build
and uncommenting the amazon-2022 platform once those are ready on the buildkite-platform repo
Signed-off-by: Sean Simmons <ssimmons@progress.com>
| -rw-r--r-- | .buildkite-platform.json | 3 | ||||
| -rwxr-xr-x | .buildkite/build-test-omnibus.sh | 10 | ||||
| -rw-r--r-- | .buildkite/hooks/pre-command | 4 | ||||
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | .expeditor/release.omnibus.yml | 8 |
5 files changed, 16 insertions, 11 deletions
diff --git a/.buildkite-platform.json b/.buildkite-platform.json index 7597215975..194cc8e5f2 100644 --- a/.buildkite-platform.json +++ b/.buildkite-platform.json @@ -1,4 +1,5 @@ { "chef_foundation": "3.0.3", - "omnibus_toolchain": "3.0.0" + "omnibus_toolchain": "3.0.0", + "omnibus_buildkite_plugin": "v0.2.85" }
\ No newline at end of file diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index ef77287e5b..893b730bd8 100755 --- a/.buildkite/build-test-omnibus.sh +++ b/.buildkite/build-test-omnibus.sh @@ -150,7 +150,7 @@ then echo " omnibus-toolchain: \"*\"" fi echo " plugins:" - echo " - chef/omnibus#852c8f81fb6dd12ff3471a8d825ec20a1168c4c4:" + echo " - chef/omnibus#$OMNIBUS_BUILDKITE_VERSION:" echo " build: chef" echo " chef-foundation-version: $CHEF_FOUNDATION_VERSION" echo " config: omnibus/omnibus.rb" @@ -174,7 +174,7 @@ then echo " agents:" echo " queue: omnibus-mac_os_x-12-x86_64" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#$OMNIBUS_BUILDKITE_VERSION:" echo " config: omnibus/omnibus.rb" echo " remote-host: buildkite-omnibus-mac_os_x-12-x86_64" echo " notarize-macos-package: chef" @@ -195,7 +195,7 @@ then echo "- key: create-build-record" echo " label: \":artifactory: Create Build Record\"" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#$OMNIBUS_BUILDKITE_VERSION:" echo " create-build-record: chef" fi @@ -278,7 +278,7 @@ then echo " omnibus-toolchain: \"*\"" fi echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#$OMNIBUS_BUILDKITE_VERSION:" echo " test: chef" echo " test-path: omnibus/omnibus-test.sh" echo " install-dir: \"/opt/chef\"" @@ -304,6 +304,6 @@ then echo "- key: promote" echo " label: \":artifactory: Promote to Current\"" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#$OMNIBUS_BUILDKITE_VERSION:" echo " promote: chef" fi
\ No newline at end of file diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 26c80c7f27..833f172416 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -16,6 +16,10 @@ OMNIBUS_TOOLCHAIN_VERSION=$(cat .buildkite-platform.json | jq -r '.omnibus_toolc export OMNIBUS_TOOLCHAIN_VERSION echo "Omnibus Toolchain Version: $OMNIBUS_TOOLCHAIN_VERSION" +OMNIBUS_BUILDKITE_VERSION=$(cat .buildkite-platform.json | jq -r '.omnibus_buildkite_plugin') +export OMNIBUS_BUILDKITE_VERSION +echo "Omnibus Buildkite Version: $OMNIBUS_BUILDKITE_VERSION" + if [ $BUILDKITE_STEP_KEY == "build-windows-2019" ] && [[ "$BUILDKITE_ORGANIZATION_SLUG" =~ chef(-canary)?$ ]] then TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 29d0cf96f5..9f7a3f22da 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -300,4 +300,4 @@ subscriptions: - bash:.expeditor/update_dep.sh - workload: schedule_triggered:chef/chef:main:nightly_build_main:* actions: - - trigger_pipeline:omnibus/adhoc + - trigger_pipeline:validate/adhoc diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index bb44478a33..8e5d3ef706 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -16,10 +16,10 @@ builder-to-testers-map: - aix-7.1-powerpc - aix-7.2-powerpc - aix-7.3-powerpc - # amazon-2022-aarch64: - # - amazon-2022-aarch64 - # amazon-2022-x86_64: - # - amazon-2022-x86_64 + amazon-2022-aarch64: + - amazon-2022-aarch64 + amazon-2022-x86_64: + - amazon-2022-x86_64 debian-9-x86_64: - debian-9-x86_64 - debian-10-x86_64 |