From f6b9d55c58e7dcf4fc523ab83a3b028793769076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Sun, 1 Nov 2026 18:28:50 +0400 Subject: [PATCH] test-kitchen: provision Cinc Client instead of Chef Infra Client Set `product_name: cinc` on the dokken provisioner so kitchen-dokken uses cincproject/cinc and skips the Chef license prompt, and pin chef_version where it was missing. --- site-cookbooks/kosmos-ejabberd/kitchen.yml | 1 + site-cookbooks/kosmos_email/kitchen.yml | 6 ++---- site-cookbooks/kosmos_garage/kitchen.yml | 2 ++ site-cookbooks/kosmos_liquor-cabinet/kitchen.yml | 2 ++ site-cookbooks/kosmos_rsk/kitchen.yml | 6 ++---- site-cookbooks/liquor_cabinet/kitchen.yml | 2 ++ 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/kitchen.yml b/site-cookbooks/kosmos-ejabberd/kitchen.yml index 00f6e6d..af198f0 100644 --- a/site-cookbooks/kosmos-ejabberd/kitchen.yml +++ b/site-cookbooks/kosmos-ejabberd/kitchen.yml @@ -14,6 +14,7 @@ transport: provisioner: name: dokken + product_name: cinc client_rb: # the ejabberd package starts its service as ejabberd@localhost during # installation; keep the chef node name in sync so ERLANG_NODE matches diff --git a/site-cookbooks/kosmos_email/kitchen.yml b/site-cookbooks/kosmos_email/kitchen.yml index 3e87682..1b3ef2a 100644 --- a/site-cookbooks/kosmos_email/kitchen.yml +++ b/site-cookbooks/kosmos_email/kitchen.yml @@ -25,10 +25,8 @@ provisioner: # always_update_cookbooks: <%= !ENV['CI'] %> # always_update_cookbooks: false - ## product_name and product_version specifies a specific Chef product and version to install. - ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/ - # product_name: chef - # product_version: 16 + # install Cinc Client instead of the license-gated Chef Infra Client + product_name: cinc verifier: name: inspec diff --git a/site-cookbooks/kosmos_garage/kitchen.yml b/site-cookbooks/kosmos_garage/kitchen.yml index 699bf10..104b2f1 100644 --- a/site-cookbooks/kosmos_garage/kitchen.yml +++ b/site-cookbooks/kosmos_garage/kitchen.yml @@ -1,6 +1,7 @@ --- driver: name: dokken + chef_version: 18.2.7 pull_platform_image: false pull_chef_image: false memory_limit: 2147483648 # 2GB @@ -10,6 +11,7 @@ transport: provisioner: name: dokken + product_name: cinc clean_dokken_sandbox: false client_rb: environment: testing diff --git a/site-cookbooks/kosmos_liquor-cabinet/kitchen.yml b/site-cookbooks/kosmos_liquor-cabinet/kitchen.yml index bd2abe1..a4db9af 100644 --- a/site-cookbooks/kosmos_liquor-cabinet/kitchen.yml +++ b/site-cookbooks/kosmos_liquor-cabinet/kitchen.yml @@ -1,10 +1,12 @@ --- driver: name: dokken + chef_version: 18.2.7 privileged: true # allows systemd services to start provisioner: name: dokken + product_name: cinc transport: name: dokken diff --git a/site-cookbooks/kosmos_rsk/kitchen.yml b/site-cookbooks/kosmos_rsk/kitchen.yml index 28f774b..b915cd8 100644 --- a/site-cookbooks/kosmos_rsk/kitchen.yml +++ b/site-cookbooks/kosmos_rsk/kitchen.yml @@ -25,10 +25,8 @@ provisioner: # always_update_cookbooks: <%= !ENV['CI'] %> # always_update_cookbooks: false - ## product_name and product_version specifies a specific Chef product and version to install. - ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/ - # product_name: chef - # product_version: 16 + # install Cinc Client instead of the license-gated Chef Infra Client + product_name: cinc verifier: name: inspec diff --git a/site-cookbooks/liquor_cabinet/kitchen.yml b/site-cookbooks/liquor_cabinet/kitchen.yml index e309743..db82d23 100644 --- a/site-cookbooks/liquor_cabinet/kitchen.yml +++ b/site-cookbooks/liquor_cabinet/kitchen.yml @@ -1,10 +1,12 @@ --- driver: name: dokken + chef_version: 18.2.7 privileged: true # allows systemd services to start provisioner: name: dokken + product_name: cinc transport: name: dokken