Skip to content

updating new chef client in tests #295

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.

Sign up for GitHub

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

Open
raviduddela wants to merge 4 commits into
base: main
Choose a base branch
from
Open

updating new chef client in tests #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a0b5a
updating new chef client in tests
raviduddela Feb 11, 2023
f83088c
updating to official chef client
raviduddela Feb 13, 2023
76f0d3d
updating version in tests
raviduddela Feb 13, 2023
d68c36c
verify build
raviduddela Feb 14, 2023
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 scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pkg_version="1.0.0"
pkg_scaffolding="ci/scaffolding-chef-infra"
pkg_svc_user=("root")
scaffold_policy_name="ci"
scaffold_chef_client="chef/chef-client/14.13.11"
scaffold_chef_client="chef/chef-infra-client/18.1.0"
scaffold_cacerts="ci/cacerts"

# Required Metadata for CI
Expand Down
1 change: 1 addition & 0 deletions scaffolding-chef-infra/tests/user-linux-api/tests/test.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ SCAFFOLD_PKG_CHEF_CLIENT_VERSION="$(echo "${scaffold_chef_client}" | cut -d/ -f3
@test "API: scaffold_chef_client version matches test version" {
result="$(hab pkg exec ${TEST_PKG_IDENT} chef-client -v | head -n 1 | awk '{print $2}')"
[ "${result}" = "${SCAFFOLD_PKG_CHEF_CLIENT_VERSION}" ]
echo $result
}

@test "API: scaffold_cacerts matches run hook SSL_CERT_FILE" {
Expand Down
2 changes: 1 addition & 1 deletion scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $pkg_version="1.0.0"
$pkg_scaffolding="ci/scaffolding-chef-infra"
$scaffold_policy_name="ci"
$scaffold_cacerts="core/cacerts"
$scaffold_chef_client="stuartpreston/chef-client-detox"
$scaffold_chef_client="chef/chef-infra-client"

# Required Metadata for CI
$pkg_description="CI Test Plan for Linux"
Expand Down
6 changes: 3 additions & 3 deletions scaffolding-chef-infra/tests/user-windows-api/tests/test.pester.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ Describe "Chef client run doesn't fail" {
}
}

Context "API: scaffold_chef_client matches run hook stuartpreston/chef-client" {
It "The chef-client should be Stuart Preston's chef-client-detox" {
Context "API: scaffold_chef_client matches run hook chef/chef-infra-client" {
It "The chef-client should be the official chef-infra-client" {
$chef_client_pkg = Get-Content "C:\hab\svc\user-windows-api\hooks\run" | Select-String -Pattern '\w+/bin/chef-client.bat -z'
$chef_client_pkg = $chef_client_pkg -split ' '
$chef_client_pkg = $chef_client_pkg[2].split('\')
$chef_client_pkg = $chef_client_pkg[3] + '/' + $chef_client_pkg[4]

$chef_client_pkg | Should be "stuartpreston/chef-client-detox"
$chef_client_pkg | Should be "chef/chef-infra-client"
}
}
}