From aa0fe75b84f3c9f81e7afb0aca82e24b208bc47a Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 18 Dec 2020 12:53:14 -0800 Subject: Resolve build / test failures now that Chef 16 is the stable relase Point the new chef-16 branch at 16-stable ohai branch Signed-off-by: Tim Smith --- .expeditor/config.yml | 58 +-------------------------------------------- Gemfile | 2 +- Gemfile.lock | 6 ++--- README.md | 2 +- kitchen-tests/Gemfile | 2 +- kitchen-tests/kitchen.yml | 2 +- omnibus/Gemfile.lock | 8 +++---- tasks/bin/run_external_test | 2 +- 8 files changed, 13 insertions(+), 69 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index f91b6462e1..a6bf54ffbc 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -100,60 +100,4 @@ subscriptions: - workload: buildkite_hab_build_group_published:{{agent_id}}:* actions: # when all of the hab package publish to the unstable channel, test and promote them - - trigger_pipeline:habitat/test - - # subscriptions to Ruby gem dependencies' releases, open PR for updates - - workload: ruby_gem_published:mixlib-archive-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:mixlib-authentication-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:mixlib-cli-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:mixlib-log-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:mixlib-shellout-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:chef-vault-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:chef-zero-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:ohai-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:inspec-core-bin-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:train-core-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:win32-process-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:win32-service-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:win32-taskscheduler-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:ffi-yajl-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:libyajl2-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:cheffish-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:license-acceptance-* - actions: - - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:ffi-libarchive-* - actions: - - bash:.expeditor/update_dep.sh + - trigger_pipeline:habitat/test \ No newline at end of file diff --git a/Gemfile b/Gemfile index 99e7cf3c6b..acf0d3d5e7 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ source "https://rubygems.org" # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed) gem "chef", path: "." -gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "16-stable" gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__)) gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__)) diff --git a/Gemfile.lock b/Gemfile.lock index 293bd11cfa..3b9ebb3f12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/chef/ohai.git revision: 1ad8c5946606a7f08ffb841e3682ae2d4991077f - branch: master + branch: 16-stable specs: ohai (16.8.1) chef-config (>= 12.8, < 17) @@ -223,7 +223,7 @@ GEM inspec-core (= 4.24.8) ipaddress (0.8.3) iso8601 (0.13.0) - json (2.4.0) + json (2.4.1) libyajl2 (1.2.0) license-acceptance (2.1.13) pastel (~> 0.7) @@ -363,7 +363,7 @@ GEM unicode-display_width (1.7.0) unicode_utils (1.4.0) uuidtools (2.1.5) - webmock (3.10.0) + webmock (3.11.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/README.md b/README.md index 6c3373a2af..2589442ee4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Chef Infra [![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef) -[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-master-verify) +[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=chef-16)](https://buildkite.com/chef-oss/chef-chef-chef-16-verify) [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef) [![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef/blob/master/docs/dev/design_documents/client_release_cadence.md) diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index bc100ffb62..89ca36f3e9 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "rake" # required to build some native extensions gem "chef", path: ".." -gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "16-stable" # avoids failures when we bump chef major gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master" gem "kitchen-dokken", "~> 2.0" gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master" diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 53641a6602..06270987b3 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -3,7 +3,7 @@ driver: name: dokken privileged: true chef_image: chef/chef - chef_version: current + chef_version: 16 transport: name: dokken diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 228db504f0..412dcba213 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: aa93b0f3c21f75508b28c1c1e016b1aa11ecf3a9 + revision: 457df26b59259183d2918e802ffb79de9a134e27 branch: master specs: omnibus-software (4.0.0) @@ -32,13 +32,13 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.407.0) + aws-partitions (1.410.0) aws-sdk-core (3.110.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.39.0) + aws-sdk-kms (1.40.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.86.2) @@ -195,7 +195,7 @@ GEM ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.4.0) - json (2.4.0) + json (2.4.1) kitchen-vagrant (1.7.2) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index e4d984e9ee..d9cdf272e9 100755 --- a/tasks/bin/run_external_test +++ b/tasks/bin/run_external_test @@ -21,7 +21,7 @@ build_dir = Dir.pwd env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \ - "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: 'master'", + "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: '16-stable'", "CHEF_LICENSE" => "accept-no-persist", } -- cgit v1.2.1