X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/590838d87d906d33b8cda36c37b3646430538509..e21ce28e6c422b39902b1886743a6155d4d4f3d9:/.github/workflows/test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 8fc5c9ba6..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
@@ -74,12 +80,13 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
+          - prometheus
+          - prometheus-server
           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin
-          - squid
           - ssl
           - stateofthemap
           - subversion
@@ -89,7 +96,6 @@ jobs:
           - sysfs
           - taginfo
           - tile
-          - tilecache
           - tilelog
           - tools
           - trac
@@ -101,37 +107,17 @@ jobs:
           - wiki
         os:
           - ubuntu-2004
-        include:
-          - os: ubuntu-1804
-            suite: osqa
-          - os: ubuntu-1804
-            suite: trac
-        exclude:
-          - suite: osqa
-            os: ubuntu-2004
-          - suite: trac
-            os: 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.1.1
-    - name: Cache gems
-      uses: actions/cache@v2
+      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
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}