From 11a0b5a546ae4c49ce1db575448412ef3efa2325 Mon Sep 17 00:00:00 2001 From: RaviDuddela Date: Sat, 11 Feb 2023 20:05:26 +0530 Subject: [PATCH 1/4] updating new chef client in tests Signed-off-by: RaviDuddela --- scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh | 2 +- scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh index 090207ff..90366ebd 100644 --- a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh +++ b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh @@ -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" scaffold_cacerts="ci/cacerts" # Required Metadata for CI diff --git a/scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1 b/scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1 index 5fe89e98..012a9ac1 100644 --- a/scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1 +++ b/scaffolding-chef-infra/tests/user-windows-api/habitat/plan.ps1 @@ -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" From f83088c9e72ba16895177564b253434e9e3aa63f Mon Sep 17 00:00:00 2001 From: RaviDuddela Date: Mon, 13 Feb 2023 13:44:54 +0530 Subject: [PATCH 2/4] updating to official chef client Signed-off-by: RaviDuddela --- scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh | 2 +- .../tests/user-windows-api/tests/test.pester.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh index 90366ebd..389590e9 100644 --- a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh +++ b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh @@ -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-infra-client" +scaffold_chef_client="chef/chef-infra-client/18.1.0/20230104193220" scaffold_cacerts="ci/cacerts" # Required Metadata for CI diff --git a/scaffolding-chef-infra/tests/user-windows-api/tests/test.pester.ps1 b/scaffolding-chef-infra/tests/user-windows-api/tests/test.pester.ps1 index 236824c6..ef9ba996 100644 --- a/scaffolding-chef-infra/tests/user-windows-api/tests/test.pester.ps1 +++ b/scaffolding-chef-infra/tests/user-windows-api/tests/test.pester.ps1 @@ -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" } } } From 76f0d3d66083a0c52e255e4b45505b1d9b4e7223 Mon Sep 17 00:00:00 2001 From: RaviDuddela Date: Mon, 13 Feb 2023 20:59:53 +0530 Subject: [PATCH 3/4] updating version in tests Signed-off-by: RaviDuddela --- scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh index 389590e9..39afc59c 100644 --- a/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh +++ b/scaffolding-chef-infra/tests/user-linux-api/habitat/plan.sh @@ -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-infra-client/18.1.0/20230104193220" +scaffold_chef_client="chef/chef-infra-client/18.1.0" scaffold_cacerts="ci/cacerts" # Required Metadata for CI From d68c36ca46ad7b86f06406a8ae031e0e3df48362 Mon Sep 17 00:00:00 2001 From: RaviDuddela Date: Tue, 14 Feb 2023 12:39:43 +0530 Subject: [PATCH 4/4] verify build Signed-off-by: RaviDuddela --- scaffolding-chef-infra/tests/user-linux-api/tests/test.bats | 1 + 1 file changed, 1 insertion(+) diff --git a/scaffolding-chef-infra/tests/user-linux-api/tests/test.bats b/scaffolding-chef-infra/tests/user-linux-api/tests/test.bats index c3718f92..11e9378d 100755 --- a/scaffolding-chef-infra/tests/user-linux-api/tests/test.bats +++ b/scaffolding-chef-infra/tests/user-linux-api/tests/test.bats @@ -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" {