Merge remote-tracking branch 'github/pull/598'

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 3f54e1038700b5609eafddd7b906f6ea14c6d86c..cfa87e44bcf72954a05c33dac06e7872a4c6e0bf 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -7,7 +7,12 @@ driver:
   env:
     - container=dokken
   ipv6: true
-  ipv6_subnet: "2001:db8:1::/64"
+  ipv6_subnet: "fd95:8552:964c::/64"
+  dns:
+    - 1.1.1.1
+    - 8.8.8.8
+    - 8.8.4.4
+    - 1.0.0.1
 
 transport:
   name: dokken
@@ -17,6 +22,7 @@ provisioner:
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true
+  clean_dokken_sandbox: true
 
 verifier:
   root_path: /opt/verifier
@@ -30,6 +36,8 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
   - name: ubuntu-22.04
     driver:
       image: dokken/ubuntu-22.04
@@ -37,13 +45,17 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-  - name: debian-11
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+  - name: debian-12
     driver:
-      image: dokken/debian-11
+      image: dokken/debian-12
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
 
 suites:
   - name: accounts
@@ -55,6 +67,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
+  - name: awscli
+    run_list:
+      - recipe[awscli::default]
   - name: backup
     run_list:
       - recipe[backup::default]
@@ -73,6 +88,9 @@ suites:
   - name: civicrm
     run_list:
       - recipe[civicrm::default]
+  - name: civicrm-staging
+    run_list:
+      - recipe[civicrm-staging::default]
   - name: clamav
     run_list:
       - recipe[clamav::default]