Skip to content

Commit

Permalink
Merge pull request #16 from chef/ashiqueps/hab_final_update
Browse files Browse the repository at this point in the history
Updated the pkg description and Gemfile
  • Loading branch information
ashiqueps authored Nov 26, 2024
2 parents c5aab67 + f6f9f96 commit 4e94449
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .expeditor/buildkite/artifact.habitat.test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $env:HAB_BLDR_CHANNEL = "LTS-2024"
$env:HAB_ORIGIN = 'ci'
$env:CHEF_LICENSE = 'accept-no-persist'
$env:HAB_LICENSE = 'accept-no-persist'
$Plan = 'test-kitchen'
$Plan = 'chef-test-kitchen-enterprise'

Write-Host "--- system details"
$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
Expand Down
31 changes: 16 additions & 15 deletions .expeditor/habitat-test.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ steps:
image: ruby:3.1
privileged: true

- label: ":windows: Validate Habitat Builds of Test Kitchen"
commands:
- .expeditor/buildkite/artifact.habitat.test.ps1
expeditor:
executor:
docker:
host_os: windows
shell: ["powershell", "-Command"]
image: rubydistros/windows-2019:3.1
user: 'NT AUTHORITY\SYSTEM'
environment:
- FORCE_FFI_YAJL=ext
- EXPIRE_CACHE=true
- CHEF_LICENSE=accept-no-persist
- CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/
# Commenting out the Windows test since it is not required for the RC1 release
# - label: ":windows: Validate Habitat Builds of Test Kitchen"
# commands:
# - .expeditor/buildkite/artifact.habitat.test.ps1
# expeditor:
# executor:
# docker:
# host_os: windows
# shell: ["powershell", "-Command"]
# image: rubydistros/windows-2019:3.1
# user: 'NT AUTHORITY\SYSTEM'
# environment:
# - FORCE_FFI_YAJL=ext
# - EXPIRE_CACHE=true
# - CHEF_LICENSE=accept-no-persist
# - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
gemspec
gem "appbundler"
gem "pry"
gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "hab_testing_branch"
gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "main"
gem "kitchen-inspec", git: "https://github.com/inspec/kitchen-inspec", branch: "temp-point-to-chef-test-kitchen-ent"

group :test do
Expand Down
2 changes: 1 addition & 1 deletion habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ _chef_client_ruby="core/ruby3_1"
pkg_name="chef-test-kitchen-enterprise"
pkg_origin="chef"
pkg_maintainer="The Chef Maintainers <[email protected]>"
pkg_description="The Chef Test Kitchen"
pkg_description="The Chef Test Kitchen Enterprise"
pkg_license=('Apache-2.0')
pkg_bin_dirs=(
bin
Expand Down

0 comments on commit 4e94449

Please sign in to comment.