diff options
author | Evan Ahlberg <evanahlberg@gmail.com> | 2023-02-07 12:51:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-07 12:51:56 -0500 |
commit | eb19c755a7ffc800ac6b28354ad80776e187c2dd (patch) | |
tree | 9cc57c2240b12ede53d01c667a19026c495105f5 /.expeditor | |
parent | 0d4e7347d6d2aab3fbe4b03ad2d9fd4ff69d2af1 (diff) | |
download | chef-eb19c755a7ffc800ac6b28354ad80776e187c2dd.tar.gz |
add esoteric platforms to validate adhoc/release pipelines (#13546)
* run pre-command on all verify pipelines
* update pre-command to pull aws credentials on both chef and chef canary
* update pre-command pipeline names
* add esoteric builds
* add build_timestamp environment variable
* update sha on omnibus plugin
* skip transitive depenceny licensing for chef-foundation
* use chef-foundation
* remove notarize
* add solaris tests
* add aix tests
* add all esoteric platforms
* Adding in changes to run publish of omnibus packages to Artifactory, as well as related gems for Linux/Windows
* set lib path in chef omnibus
* move lib dirs to software
* Adding in if statement around artifactory api key, as its not needed for macOS (only Artifactory password needed)
* Log every macho?
* Fixing regex check
* Extend the bin dirs and lib dirs.
* remove mac osx 10
* Remove lib dirs.
* Update the version of omnibus-buildkite-plugin.
* Fixing unbound variable error on filter; Fixing notarize macOS so it doesn't run when macOS is filtered out of build
* Adding in changes to retry/timeout on esoteric builds; Adding in dependency check on macOS Notarize
* add build record step on validate/release pipeline
* fix comparison for pipeline slug
* Adding in code to promote the packages when runnong validate/release
* remove comments and fix omnibus branch
* Fixing potential issue with BUILDKITE_BUILD_CREATOR_TEAMS being unset
* get role attached to ec2 server instead of hardcoding
* Update omnibus bundle with license_scout
* Dynamically determine the version of ruby.
* replace . with _ in notraize step
* Move lib_dirs logic to chef-foundation
* remove skip_transitive_depenency_licensing and add comments to build/test arrays
* increase timeout on esoteric to 120 mins
* fix mac osx depends on and update pipeline name to regex
* align omnibus plugin version to 0.2.83
* add check for centos6 in omnibus-test.sh
* add comments for empty array check
---------
Signed-off-by: Evan Ahlberg <evanahlberg@gmail.com>
Signed-off-by: Jesse Prieur <jesse.prieur@gmail.com>
Signed-off-by: Gregory Schofield <grschofi@progress.com>
Co-authored-by: Jesse Prieur <jesse.prieur@gmail.com>
Co-authored-by: Gregory Schofield <grschofi@progress.com>
Diffstat (limited to '.expeditor')
-rw-r--r-- | .expeditor/config.yml | 10 | ||||
-rw-r--r-- | .expeditor/scripts/omnibus_chef_build.ps1 | 17 | ||||
-rwxr-xr-x | .expeditor/scripts/omnibus_chef_build.sh | 9 | ||||
-rw-r--r-- | .expeditor/scripts/omnibus_chef_publish.rb | 2 |
4 files changed, 24 insertions, 14 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 6a338ec4e1..29d0cf96f5 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -143,11 +143,11 @@ subscriptions: - "Expeditor: Skip Habitat" - "Expeditor: Skip All" only_if: built_in:bump_version - - trigger_pipeline:omnibus/release: - ignore_labels: - - "Expeditor: Skip Omnibus" - - "Expeditor: Skip All" - only_if: built_in:bump_version + # - trigger_pipeline:omnibus/release: + # ignore_labels: + # - "Expeditor: Skip Omnibus" + # - "Expeditor: Skip All" + # only_if: built_in:bump_version - trigger_pipeline:validate/release: ignore_labels: - "Expeditor: Skip Omnibus" diff --git a/.expeditor/scripts/omnibus_chef_build.ps1 b/.expeditor/scripts/omnibus_chef_build.ps1 index c3ac569ff4..bcedaa1b60 100644 --- a/.expeditor/scripts/omnibus_chef_build.ps1 +++ b/.expeditor/scripts/omnibus_chef_build.ps1 @@ -31,9 +31,11 @@ $env:ARTIFACTORY_USERNAME="buildkite" Write-Output "--- Install Chef Foundation" . { Invoke-WebRequest -useb https://omnitruck.chef.io/chef/install.ps1 } | Invoke-Expression; install -channel "current" -project "chef-foundation" -v $CHEF_FOUNDATION_VERSION +$env:PROJECT_NAME="chef" +$env:OMNIBUS_PIPELINE_DEFINITION_PATH="${ScriptDir}/../release.omnibus.yaml" $env:OMNIBUS_SIGNING_IDENTITY="${thumb}" $env:HOMEDRIVE = "C:" -$env:HOMEPATH = "\buildkite-agent" +$env:HOMEPATH = "\Users\ContainerAdministrator" $env:OMNIBUS_TOOLCHAIN_INSTALL_DIR = "C:\opscode\omnibus-toolchain" $env:SSL_CERT_FILE = "${env:OMNIBUS_TOOLCHAIN_INSTALL_DIR}\embedded\ssl\certs\cacert.pem" $env:MSYS2_INSTALL_DIR = "C:\msys64" @@ -59,8 +61,11 @@ bundle exec omnibus build chef -l internal --override append_timestamp:false Write-Output "--- Uploading package to BuildKite" C:\buildkite-agent\bin\buildkite-agent.exe artifact upload "pkg/*.msi*" -# if ($env:BUILDKITE_ORGANIZATION_SLUG -ne "chef-oss" ) -# { -# Write-Output "--- Publishing package to Artifactory" -# bundle exec ruby "${SCRIPT_DIR}/omnibus_chef_publish.rb" -# } +if ($env:BUILDKITE_ORGANIZATION_SLUG -ne "chef-oss" ) +{ + Write-Output "--- Setting up Gem API Key" + $env:GEM_HOST_API_KEY = "Basic ${env:ARTIFACTORY_API_KEY}" + + Write-Output "--- Publishing package to Artifactory" + bundle exec ruby "${ScriptDir}/omnibus_chef_publish.rb" +} diff --git a/.expeditor/scripts/omnibus_chef_build.sh b/.expeditor/scripts/omnibus_chef_build.sh index f2ede50d08..3c4130a8c3 100755 --- a/.expeditor/scripts/omnibus_chef_build.sh +++ b/.expeditor/scripts/omnibus_chef_build.sh @@ -45,5 +45,10 @@ do buildkite-agent artifact upload "pkg/*.${ext}*" done -# echo "--- Publishing package to Artifactory" -# bundle exec ruby "${SCRIPT_DIR}/omnibus_chef_publish.rb"
\ No newline at end of file +if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]]; then + echo "--- Setting up Gem credentials" + export GEM_HOST_API_KEY="Basic ${ARTIFACTORY_API_KEY}" + + echo "--- Publishing package to Artifactory" + bundle exec ruby "${SCRIPT_DIR}/omnibus_chef_publish.rb" +fi
\ No newline at end of file diff --git a/.expeditor/scripts/omnibus_chef_publish.rb b/.expeditor/scripts/omnibus_chef_publish.rb index a818c67799..9413e9740d 100644 --- a/.expeditor/scripts/omnibus_chef_publish.rb +++ b/.expeditor/scripts/omnibus_chef_publish.rb @@ -87,7 +87,7 @@ if (project_name == "chef") && (ENV['ADHOC'] != 'true') # This mimics the behavior of the gem command line, and is a public api: # http://docs.seattlerb.org/rubygems/Gem/Command.html gem_pusher = Gem::Commands::PushCommand.new - gem_pusher.handle_options [gem_path, '--host', artifactory_endpoint, '--key', 'artifactory_api_key', '--verbose'] + gem_pusher.handle_options [gem_path, '--host', artifactory_endpoint, '--verbose'] gem_pusher.execute end end |