diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh index 2fec5a726..5a17b7d79 100755 --- a/.expeditor/buildkite/artifact.habitat.test.sh +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -3,7 +3,7 @@ set -eo pipefail export HAB_ORIGIN='ci' -export PLAN='test-kitchen' +export PLAN='chef-test-kitchen-enterprise' export CHEF_LICENSE="accept-no-persist" export HAB_LICENSE="accept-no-persist" export HAB_BLDR_CHANNEL="LTS-2024" @@ -63,7 +63,7 @@ hab pkg install -b "${project_root:?is undefined}/results/${pkg_artifact:?is und echo "+++ Testing $PLAN" -PATH="$(hab pkg path ci/test-kitchen)/bin:$PATH" +PATH="$(hab pkg path ci/chef-test-kitchen-enterprise)/bin:$PATH" export PATH echo "PATH is $PATH" diff --git a/CHANGELOG.md b/CHANGELOG.md index b2eb9be7f..84de6b9b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # Test Kitchen Change Log -### Changes not yet released to rubygems.org \ No newline at end of file +## Changes not yet released to rubygems.org + diff --git a/chef-test-kitchen-enterprise.gemspec b/chef-test-kitchen-enterprise.gemspec index d79c134a8..5f7b91daf 100644 --- a/chef-test-kitchen-enterprise.gemspec +++ b/chef-test-kitchen-enterprise.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |gem| gem.add_dependency "net-scp", ">= 1.1", "< 5.0" # pinning until we can confirm 4+ works gem.add_dependency "net-ssh", ">= 2.9", "< 8.0" # pinning until we can confirm 8+ works gem.add_dependency "net-ssh-gateway", ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works - gem.add_dependency "thor", ">= 0.19", "< 1.3.0" + gem.add_dependency "thor", ">= 0.19", "< 1.3.0" # downgrading thor bec inspec-core depends on < 1.3.0 gem.add_dependency "winrm", "~> 2.0" gem.add_dependency "winrm-elevated", "~> 1.0" gem.add_dependency "winrm-fs", "~> 1.1" diff --git a/lib/kitchen/cli.rb b/lib/kitchen/cli.rb index 8b9fe5446..a0d6588e9 100644 --- a/lib/kitchen/cli.rb +++ b/lib/kitchen/cli.rb @@ -287,7 +287,7 @@ def exec(*args) desc "version", "Print Test Kitchen's version information" def version - puts "Progress Chef Test Kitchen version #{Kitchen::VERSION}" + puts "Chef Test Kitchen Enterprise Version #{Kitchen::VERSION}" end map %w{-v --version} => :version diff --git a/post-bundle-install.rb b/post-bundle-install.rb index aef6ddd3c..e9ae4304f 100644 --- a/post-bundle-install.rb +++ b/post-bundle-install.rb @@ -15,6 +15,7 @@ puts "#{gempath}" matches = File.basename(gempath).match(/.*-[A-Fa-f0-9]{12}/) next unless matches + gem_name = File.basename(Dir["#{gempath}/*.gemspec"].first, ".gemspec") # FIXME: should strip any valid ruby platform off of the gem_name if it matches @@ -26,5 +27,4 @@ system("gem build #{gem_name}.gemspec") or raise "gem build failed" system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed" end - end