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

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index a79c1582937f172896f1c2b366e6b133478ea381..cfa87e44bcf72954a05c33dac06e7872a4c6e0bf 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,6 +6,13 @@ driver:
     - /var/lib/docker
   env:
     - container=dokken
     - /var/lib/docker
   env:
     - container=dokken

+  ipv6: true
+  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
 
 transport:
   name: dokken


@@ -15,6 +22,7 @@ provisioner:
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true

+  clean_dokken_sandbox: true

 
 verifier:
   root_path: /opt/verifier
 
 verifier:
   root_path: /opt/verifier


@@ -28,6 +36,8 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       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
   - name: ubuntu-22.04
     driver:
       image: dokken/ubuntu-22.04


@@ -35,13 +45,17 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       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:
     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
       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
 
 suites:
   - name: accounts


@@ -53,6 +67,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: apt
     run_list:
       - recipe[apt::default]

+  - name: awscli
+    run_list:
+      - recipe[awscli::default]

   - name: backup
     run_list:
       - recipe[backup::default]
   - name: backup
     run_list:
       - recipe[backup::default]


@@ -71,6 +88,9 @@ suites:
   - name: civicrm
     run_list:
       - recipe[civicrm::default]
   - name: civicrm
     run_list:
       - recipe[civicrm::default]

+  - name: civicrm-staging
+    run_list:
+      - recipe[civicrm-staging::default]

   - name: clamav
     run_list:
       - recipe[clamav::default]
   - name: clamav
     run_list:
       - recipe[clamav::default]