Skip to content

Commit

Permalink
fixing the linting and other issues
Browse files Browse the repository at this point in the history
Signed-off-by: nikhil2611 <[email protected]>
  • Loading branch information
nikhil2611 committed Nov 11, 2024
1 parent 0baa132 commit 9b828f6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .expeditor/buildkite/artifact.habitat.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Test Kitchen Change Log
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/#common-changelog -->
<!-- release_rollup -->
### Changes not yet released to rubygems.org
## Changes not yet released to rubygems.org
<!-- latest_release -->
2 changes: 1 addition & 1 deletion chef-test-kitchen-enterprise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion post-bundle-install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

0 comments on commit 9b828f6

Please sign in to comment.