Revert "Temporarily add community role to Sarel to setup base"

[chef.git] / .github / workflows / test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 0fcb574614cabd77c9ea1ef9c2b0b2963fb29dee..76305aaa2cde46bbe78618c85727a874bad8b7b3 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -1,11 +1,17 @@
 name: Test Kitchen
 name: Test Kitchen

+

 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+

 jobs:
   kitchen:
     name: Test Kitchen
 jobs:
   kitchen:
     name: Test Kitchen

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

     strategy:
       matrix:
         suite:
     strategy:
       matrix:
         suite:


@@ -18,6 +24,7 @@ jobs:
           - blogs
           - civicrm
           - clamav
           - blogs
           - civicrm
           - clamav

+          - community

           - db-backup
           - db-base
           - db-master
           - db-backup
           - db-base
           - db-master


@@ -49,6 +56,7 @@ jobs:
           - logstash-forwarder
           - mail
           - mailman
           - logstash-forwarder
           - mail
           - mailman

+          - matomo

           - memcached
           - munin
           - munin-plugins
           - memcached
           - munin
           - munin-plugins


@@ -63,11 +71,11 @@ jobs:
           - osmosis
           - osqa
           - otrs
           - osmosis
           - osqa
           - otrs

+          - overpass

           - passenger
           - php
           - php-apache
           - php-fpm
           - passenger
           - php
           - php-apache
           - php-fpm

-          - piwik

           - planet
           - planet-current
           - planet-dump
           - planet
           - planet-current
           - planet-dump


@@ -81,9 +89,11 @@ jobs:
           - serverinfo
           - snmpd
           - spamassassin
           - serverinfo
           - snmpd
           - spamassassin

-          - squid

           - ssl
           - stateofthemap
           - ssl
           - stateofthemap

+          - stateofthemap-jekyll
+          - stateofthemap-static
+          - stateofthemap-wordpress

           - subversion
           - supybot
           - switch2osm
           - subversion
           - supybot
           - switch2osm


@@ -91,45 +101,34 @@ jobs:
           - sysfs
           - taginfo
           - tile
           - sysfs
           - taginfo
           - tile

-          - tilecache

           - tilelog
           - tools
           - trac
           - tilelog
           - tools
           - trac

-          - web-backend

           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress
           - wiki
         os:
           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress
           - wiki
         os:

-          - ubuntu-2004
+          - ubuntu-2204

         include:
         include:

-          - suite: trac
-            os: ubuntu-1804
+          - os: ubuntu-2004
+            suite: mailman
+          - os: ubuntu-2004
+            suite: osqa

         exclude:
         exclude:

-          - suite: trac
-            os: ubuntu-2004
+          - suite: mailman
+            os: ubuntu-2204
+          - suite: osqa
+            os: ubuntu-2204

       fail-fast: false
     steps:
     - name: Check out code
       fail-fast: false
     steps:
     - name: Check out code

-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

     - name: Setup ruby
     - name: Setup ruby

-      uses: actions/setup-ruby@v1.1.2
-    - name: Cache gems
-      uses: actions/cache@v2
+      uses: ruby/setup-ruby@v1

       with:
       with:

-        path: vendor/bundle
-        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
-        restore-keys: |
-          bundle-${{ runner.OS }}-
-    - 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
+        ruby-version: 3.1
+        bundler-cache: true

     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}