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

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 39fbc4de241765a16145cb5e32629f6a15223b74..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
-        - 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
@@ -47,7 +47,7 @@ platforms:
       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
@@ -56,7 +56,7 @@ platforms:
       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
@@ -250,15 +250,6 @@ suites:
   - 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]
@@ -289,6 +280,9 @@ suites:
   - name: otrs
     run_list:
       - recipe[otrs::default]
+  - name: otrs-debian
+    run_list:
+      - recipe[otrs::debian]
   - name: overpass
     run_list:
       - recipe[overpass::default]