X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19019c92db709bad0df7bf67b4283e26b656360b..26f4ea548415ecc20ad1eeb2b9954f64e257931e:/.github/workflows/test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 1a90a238c..577297c7b 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -1,7 +1,13 @@
 name: Test Kitchen
+
 on:
   - push
   - pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   kitchen:
     name: Test Kitchen
@@ -25,6 +31,8 @@ jobs:
           - devices
           - dhcpd
           - dmca
+          - dns
+          - docker
           - donate
           - elasticsearch
           - exim
@@ -40,10 +48,12 @@ jobs:
           - hardware
           - hot
           - incron
+          - irc
           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder
+          - mail
           - mailman
           - memcached
           - munin
@@ -53,12 +63,16 @@ jobs:
           - networking
           - nginx
           - nodejs
+          - nominatim
           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs
           - passenger
+          - php
+          - php-apache
+          - php-fpm
           - piwik
           - planet
           - planet-current
@@ -66,12 +80,13 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
+          - prometheus
+          - prometheus-server
           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin
-          - squid
           - ssl
           - stateofthemap
           - subversion
@@ -81,35 +96,28 @@ jobs:
           - sysfs
           - taginfo
           - tile
-          - tilecache
+          - tilelog
           - tools
           - trac
           - web-backend
           - web-cgimap
           - web-frontend
           - web-rails
+          - wordpress
+          - wiki
         os:
-          - ubuntu-1804
+          - ubuntu-2004
       fail-fast: false
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
-    - name: Cache gems
-      uses: actions/cache@v1
+      uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
-        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ runner.OS }}-
+        bundler-cache: true
     - name: Disable apparmor for mysqld
       run: |
         sudo apt-get install apparmor-utils
         sudo aa-disable /usr/sbin/mysqld
-    - name: Install gems
-      run: |
-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}