diff options
| author | Vikram Karve <vikram.karve@progress.com> | 2023-03-03 19:29:34 +0530 |
|---|---|---|
| committer | Vikram Karve <vikram.karve@progress.com> | 2023-03-06 18:07:49 +0530 |
| commit | 7fbaaffedeb789849633113264ef5edc3e25a1db (patch) | |
| tree | d4da3333976f866425d3b9815daa7365351919cd | |
| parent | c73ae869ea3d4a9bd4129fba471e2d82938e36e6 (diff) | |
| download | chef-7fbaaffedeb789849633113264ef5edc3e25a1db.tar.gz | |
Update omnibus-buildkite-plugin version in sync with expeditor
Signed-off-by: Vikram Karve <vikram.karve@progress.com>
| -rw-r--r-- | .buildkite-platform.json | 3 | ||||
| -rwxr-xr-x | .buildkite/build-test-omnibus.sh | 8 | ||||
| -rw-r--r-- | .buildkite/hooks/pre-command | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.buildkite-platform.json b/.buildkite-platform.json index f695f86540..f710c80c23 100644 --- a/.buildkite-platform.json +++ b/.buildkite-platform.json @@ -1,4 +1,5 @@ { "chef_foundation": "2.0.0", - "omnibus_toolchain": "3.0.0" + "omnibus_toolchain": "3.0.0", + "omnibus_plugin_version": "0.2.86" }
\ No newline at end of file diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index 14d0cf9f1c..db26f309b5 100755 --- a/.buildkite/build-test-omnibus.sh +++ b/.buildkite/build-test-omnibus.sh @@ -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#v$OMNIBUS_PLUGIN_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#v$OMNIBUS_PLUGIN_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#v$OMNIBUS_PLUGIN_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#v$OMNIBUS_PLUGIN_VERSION:" echo " promote: chef" fi
\ No newline at end of file diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index b056ea6e13..53d2a22630 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -17,6 +17,11 @@ OMNIBUS_TOOLCHAIN_VERSION=$(cat .buildkite-platform.json | jq -r '.omnibus_toolc export OMNIBUS_TOOLCHAIN_VERSION echo "Omnibus Toolchain Version: $OMNIBUS_TOOLCHAIN_VERSION" +OMNIBUS_PLUGIN_VERSION=$(cat .buildkite-platform.json | jq -r '.omnibus_plugin_version') +export OMNIBUS_PLUGIN_VERSION +echo "Omnibus Buildkite Plugin Version: $OMNIBUS_PLUGIN_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") |