Drop custom ohai plugin path

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 5795b9c7fda8b38273c0f331c1302b603e94d5e9..26d1c6a705b9307ae9c392e42f0840b250aca89f 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -38,7 +38,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
       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
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload

   - name: ubuntu-22.04
     driver:
       image: ghcr.io/test-kitchen/dokken/ubuntu-22.04
   - name: ubuntu-22.04
     driver:
       image: ghcr.io/test-kitchen/dokken/ubuntu-22.04


@@ -47,7 +47,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
       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
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload

   - name: debian-12
     driver:
       image: ghcr.io/test-kitchen/dokken/debian-12
   - name: debian-12
     driver:
       image: ghcr.io/test-kitchen/dokken/debian-12


@@ -56,7 +56,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
       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
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -86,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]


@@ -153,6 +156,9 @@ suites:
   - name: foundation-dwg
     run_list:
       - recipe[foundation::dwg]
   - name: foundation-dwg
     run_list:
       - recipe[foundation::dwg]

+  - name: foundation-mastodon
+    run_list:
+      - recipe[foundation::mastodon]

   - name: foundation-mwg
     run_list:
       - recipe[foundation::mwg]
   - name: foundation-mwg
     run_list:
       - recipe[foundation::mwg]


@@ -203,6 +209,9 @@ suites:
   - name: ideditor
     run_list:
       - recipe[ideditor::default]
   - name: ideditor
     run_list:
       - recipe[ideditor::default]

+  - name: imagery-tiler
+    run_list:
+      - recipe[imagery::tiler]

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


@@ -241,15 +250,6 @@ suites:
   - name: memcached
     run_list:
       - recipe[memcached::default]
   - name: memcached
     run_list:
       - recipe[memcached::default]

-  - name: munin
-    run_list:
-      - recipe[munin::default]
-  - name: munin-plugins
-    run_list:
-      - recipe[munin::plugins]
-  - name: munin-server
-    run_list:
-      - recipe[munin::server]

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


@@ -280,6 +280,9 @@ suites:
   - name: otrs
     run_list:
       - recipe[otrs::default]
   - name: otrs
     run_list:
       - recipe[otrs::default]

+  - name: otrs-debian
+    run_list:
+      - recipe[otrs::debian]

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