Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the pkg description and Gemfile #16

Merged
merged 5 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading