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

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 5c622df16ba003f872fc58a35e74c9f6a71bcb9b..95cbdc8781fee8595f5443d8840e962371778290 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -3,15 +3,18 @@ name: Test Kitchen
 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+  - workflow_dispatch

 
 concurrency:
 
 concurrency:

-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

   cancel-in-progress: true
 
 jobs:
   kitchen:
     name: Test Kitchen
   cancel-in-progress: true
 
 jobs:
   kitchen:
     name: Test Kitchen

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    permissions:
+      packages: read

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


@@ -34,11 +37,15 @@ jobs:
           - dmca
           - dns
           - docker
           - dmca
           - dns
           - docker

-          - donate

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

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

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


@@ -48,7 +55,7 @@ jobs:
           - gps-tile
           - hardware
           - hot
           - gps-tile
           - hardware
           - hot

-          - incron
+          - ideditor

           - irc
           - kibana
           - letsencrypt
           - irc
           - kibana
           - letsencrypt


@@ -77,6 +84,7 @@ jobs:
           - php-apache
           - php-fpm
           - planet
           - php-apache
           - php-fpm
           - planet

+          - planet-aws

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


@@ -90,7 +98,8 @@ jobs:
           - snmpd
           - spamassassin
           - ssl
           - snmpd
           - spamassassin
           - ssl

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

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


@@ -107,14 +116,34 @@ jobs:
           - wordpress
           - wiki
         os:
           - wordpress
           - wiki
         os:

-          - ubuntu-2004
+          - 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:
       fail-fast: false
     steps:

+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}

     - name: Check out code
     - name: Check out code

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

     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:

+        ruby-version: 3.1

         bundler-cache: true
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
         bundler-cache: true
     - 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() }}