Revert "imagery: use stop_when_unneeded for mapserver service"

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 234baa86c1a919e1306342fe42f501b16ec46547..e1c8df5558e0d817e3e245987b5f2bfe27495634 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -21,6 +21,7 @@ jobs:
           - accounts
           - apache
           - apt
+          - apt-repository
           - backup
           - bind
           - blog
@@ -33,6 +34,7 @@ jobs:
           - db-base
           - db-master
           - db-slave
+          - dev
           - devices
           - dhcpd
           - dmca
@@ -41,6 +43,7 @@ jobs:
           - elasticsearch
           - exim
           - fail2ban
+          - foundation-birthday
           - foundation-board
           - foundation-dwg
           - foundation-mastodon
@@ -58,7 +61,6 @@ jobs:
           - hardware
           - hot
           - ideditor
-          - imagery-tiler
           - irc
           - kibana
           - letsencrypt
@@ -68,8 +70,6 @@ jobs:
           - mailman
           - matomo
           - memcached
-          - munin
-          - munin-plugins
           - mysql
           - networking
           - nginx
@@ -112,6 +112,7 @@ jobs:
           - tilelog
           - tools
           - trac
+          - vectortile
           - web-cgimap
           - web-frontend
           - web-rails
@@ -124,11 +125,65 @@ jobs:
             suite: mailman
           - os: ubuntu-2004
             suite: osqa
+          - os: debian-12
+            suite: apt-repository
+          - os: debian-12
+            suite: dev
+          - os: debian-12
+            suite: dns
+          - os: debian-12
+            suite: git-server
+          - os: debian-12
+            suite: git-web
+          - os: debian-12
+            suite: imagery-tiler
+          - os: debian-12
+            suite: letsencrypt
+          - os: debian-12
+            suite: otrs
+          - os: debian-12
+            suite: serverinfo
+          - os: debian-12
+            suite: supybot
+          - os: debian-12
+            suite: vectortile
+          - os: debian-12
+            suite: web-cgimap
+          - os: debian-12
+            suite: web-frontend
+          - os: debian-12
+            suite: web-rails
         exclude:
+          - suite: apt-repository
+            os: ubuntu-2204
+          - suite: dev
+            os: ubuntu-2204
+          - suite: dns
+            os: ubuntu-2204
+          - suite: git-server
+            os: ubuntu-2204
+          - suite: git-web
+            os: ubuntu-2204
           - suite: mailman
             os: ubuntu-2204
+          - suite: letsencrypt
+            os: ubuntu-2204
           - suite: osqa
             os: ubuntu-2204
+          - suite: otrs
+            os: ubuntu-2204
+          - suite: serverinfo
+            os: ubuntu-2204
+          - suite: supybot
+            os: ubuntu-2204
+          - suite: vectortile
+            os: ubuntu-2204
+          - suite: web-cgimap
+            os: ubuntu-2204
+          - suite: web-frontend
+            os: ubuntu-2204
+          - suite: web-rails
+            os: ubuntu-2204
       fail-fast: false
     steps:
     - name: Login to GitHub Container Registry
@@ -137,6 +192,12 @@ jobs:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: github.repository == 'openstreetmap/chef' && github.event_name != 'pull_request'
     - name: Check out code
       uses: actions/checkout@v4
     - name: Setup ruby
@@ -147,5 +208,8 @@ jobs:
     - 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
+      run: |
+        bundle exec kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl --since=yesterday"
+        bundle exec kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "networkctl status --all"
+        bundle exec kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "resolvectl status" || true
       if: ${{ failure() }}