Drop cogent addresses from Amsterdam machines

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 613addabd8e243c9f0a693e43f7010a8a3899edd..63b74169556c2f4279bbd1d95dc0120da7d27abc 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


@@ -25,11 +32,18 @@ jobs:
           - devices
           - dhcpd
           - dmca
           - devices
           - dhcpd
           - dmca

+          - dns
+          - docker

           - donate
           - elasticsearch
           - exim
           - fail2ban
           - donate
           - elasticsearch
           - exim
           - fail2ban

-          - forum
+          - foundation-board
+          - foundation-dwg
+          - foundation-mwg
+          - foundation-owg
+          - foundation-welcome
+          - foundation-wiki

           - ftp
           - geodns
           - geoipupdate
           - ftp
           - geodns
           - geoipupdate


@@ -39,13 +53,15 @@ jobs:
           - gps-tile
           - hardware
           - hot
           - gps-tile
           - hardware
           - hot

-          - incron
+          - ideditor
+          - irc

           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder
           - mail
           - mailman
           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder
           - mail
           - mailman

+          - matomo

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


@@ -54,27 +70,33 @@ jobs:
           - networking
           - nginx
           - nodejs
           - networking
           - nginx
           - nodejs

+          - nominatim

           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs
           - ntp
           - openssh
           - osmosis
           - osqa
           - otrs

+          - overpass

           - passenger
           - passenger

-          - piwik
+          - php
+          - php-apache
+          - php-fpm

           - planet
           - planet-current
           - planet-dump
           - planet-notes
           - planet-replication
           - postgresql
           - planet
           - planet-current
           - planet-dump
           - planet-notes
           - planet-replication
           - postgresql

+          - prometheus
+          - prometheus-server

           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin
           - python
           - rsyncd
           - serverinfo
           - snmpd
           - spamassassin

-          - squid

           - ssl
           - ssl

-          - stateofthemap
+          - stateofthemap-container
+          - stateofthemap-wordpress

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


@@ -82,37 +104,37 @@ jobs:
           - sysfs
           - taginfo
           - tile
           - sysfs
           - taginfo
           - tile

-          - tilecache

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

-          - web-backend

           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress
           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress

+          - wiki

         os:
         os:

-          - ubuntu-1804
+          - ubuntu-2204
+        include:
+          - os: ubuntu-2004
+            suite: mailman
+          - os: ubuntu-2004
+            suite: osqa
+        exclude:
+          - 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
-    - name: Cache gems
-      uses: actions/cache@v1
+      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 --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        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 }}

+    - name: Gather journal output
+      run: bundle exec kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c journalctl --since=yesterday
+      if: ${{ failure() }}