Update chef client to 18.4.2

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 830cc04c5fec876a7ace08a9f9918dab986c28f6..39fbc4de241765a16145cb5e32629f6a15223b74 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,26 +22,41 @@ 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:
 
 verifier:

+  name: inspec

   root_path: /opt/verifier
   sudo: false
 
 platforms:
   - name: ubuntu-20.04
     driver:
   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:
         - 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

   - name: ubuntu-22.04
     driver:
   - 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:
         - 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
+  - name: debian-12
+    driver:
+      image: ghcr.io/test-kitchen/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
 
 suites:
   - name: accounts


@@ -46,6 +68,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]


@@ -61,6 +86,9 @@ suites:
   - name: blogs
     run_list:
       - recipe[blogs::default]
   - name: blogs
     run_list:
       - recipe[blogs::default]

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

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


@@ -97,9 +125,10 @@ suites:
           test:
             interface: eth0
             role: internal
           test:
             interface: eth0
             role: internal

-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1

         roles:
           external:
             zone: test
         roles:
           external:
             zone: test


@@ -112,9 +141,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
   - name: docker
     run_list:
       - recipe[docker::default]

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

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


@@ -124,9 +150,27 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]

-  - name: forum
+  - name: foundation-board
+    run_list:
+      - recipe[foundation::board]
+  - name: foundation-dwg
+    run_list:
+      - recipe[foundation::dwg]
+  - name: foundation-mastodon

     run_list:
     run_list:

-      - recipe[forum::default]
+      - recipe[foundation::mastodon]
+  - name: foundation-mwg
+    run_list:
+      - recipe[foundation::mwg]
+  - name: foundation-owg
+    run_list:
+      - recipe[foundation::owg]
+  - name: foundation-welcome
+    run_list:
+      - recipe[foundation::welcome]
+  - name: foundation-wiki
+    run_list:
+      - recipe[foundation::wiki]

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


@@ -138,7 +182,9 @@ suites:
         interfaces:
           test:
             role: external
         interfaces:
           test:
             role: external

-            address: 172.18.0.2
+            inet:
+              address: 172.18.0.2
+              prefix: 16

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


@@ -160,9 +206,12 @@ suites:
   - name: hot
     run_list:
       - recipe[hot::default]
   - name: hot
     run_list:
       - recipe[hot::default]

-  - name: incron
+  - name: ideditor
+    run_list:
+      - recipe[ideditor::default]
+  - name: imagery-tiler

     run_list:
     run_list:

-      - recipe[incron::default]
+      - recipe[imagery::tiler]

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


@@ -258,6 +307,9 @@ suites:
   - name: planet
     run_list:
       - recipe[planet::default]
   - name: planet
     run_list:
       - recipe[planet::default]

+  - name: planet-aws
+    run_list:
+      - recipe[planet::aws]

   - name: planet-current
     run_list:
       - recipe[planet::current]
   - name: planet-current
     run_list:
       - recipe[planet::current]


@@ -282,7 +334,7 @@ suites:
     attributes:
       postgresql:
         versions:
     attributes:
       postgresql:
         versions:

-          - 10
+          - 15

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


@@ -292,15 +344,13 @@ suites:
           test:
             interface: eth0
             role: internal
           test:
             interface: eth0
             role: internal

-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1

   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]

-    attributes:
-      prometheus:
-        promscale: true

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


@@ -319,15 +369,9 @@ suites:
   - name: ssl
     run_list:
       - recipe[ssl::default]
   - name: ssl
     run_list:
       - recipe[ssl::default]

-  - name: stateofthemap
-    run_list:
-      - recipe[stateofthemap::default]
-  - name: stateofthemap-static
+  - name: stateofthemap-container

     run_list:
     run_list:

-      - recipe[stateofthemap::static]
-  - name: stateofthemap-jekyll
-    run_list:
-      - recipe[stateofthemap::jekyll]
+      - recipe[stateofthemap::container]

   - name: stateofthemap-wordpress
     run_list:
       - recipe[stateofthemap::wordpress]
   - name: stateofthemap-wordpress
     run_list:
       - recipe[stateofthemap::wordpress]


@@ -359,9 +403,6 @@ suites:
   - name: tilelog
     run_list:
       - recipe[tilelog::default]
   - name: tilelog
     run_list:
       - recipe[tilelog::default]

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

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