Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index cfa87e44bcf72954a05c33dac06e7872a4c6e0bf..5795b9c7fda8b38273c0f331c1302b603e94d5e9 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -25,13 +25,14 @@ provisioner:
   clean_dokken_sandbox: true
 
 verifier:
+  name: inspec
   root_path: /opt/verifier
   sudo: false
 
 platforms:
   - name: ubuntu-20.04
     driver:
-      image: dokken/ubuntu-20.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-20.04
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
@@ -40,7 +41,7 @@ platforms:
         - RUN echo libeatmydata.so >>/etc/ld.so.preload
   - name: ubuntu-22.04
     driver:
-      image: dokken/ubuntu-22.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-22.04
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
@@ -49,7 +50,7 @@ platforms:
         - RUN echo libeatmydata.so >>/etc/ld.so.preload
   - name: debian-12
     driver:
-      image: dokken/debian-12
+      image: ghcr.io/test-kitchen/dokken/debian-12
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
@@ -88,9 +89,6 @@ suites:
   - name: civicrm
     run_list:
       - recipe[civicrm::default]
-  - name: civicrm-staging
-    run_list:
-      - recipe[civicrm-staging::default]
   - name: clamav
     run_list:
       - recipe[clamav::default]
@@ -140,9 +138,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
-  - name: donate
-    run_list:
-      - recipe[donate::default]
   - name: elasticsearch
     run_list:
       - recipe[elasticsearch::default]
@@ -303,6 +298,9 @@ suites:
   - name: planet
     run_list:
       - recipe[planet::default]
+  - name: planet-aws
+    run_list:
+      - recipe[planet::aws]
   - name: planet-current
     run_list:
       - recipe[planet::current]