Merge remote-tracking branch 'github/pull/349' into master

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index edfe0b8321479d98e3b4dfe86d4562734ea1c7b2..0fcb574614cabd77c9ea1ef9c2b0b2963fb29dee 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -25,6 +25,8 @@ jobs:
           - devices
           - dhcpd
           - dmca
           - devices
           - dhcpd
           - dmca

+          - dns
+          - docker

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


@@ -40,10 +42,12 @@ jobs:
           - hardware
           - hot
           - incron
           - hardware
           - hot
           - incron

+          - irc

           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder
           - kibana
           - letsencrypt
           - logstash
           - logstash-forwarder

+          - mail

           - mailman
           - memcached
           - munin
           - mailman
           - memcached
           - munin


@@ -53,12 +57,16 @@ jobs:
           - networking
           - nginx
           - nodejs
           - networking
           - nginx
           - nodejs

+          - nominatim

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

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

           - piwik
           - planet
           - planet-current
           - piwik
           - planet
           - planet-current


@@ -66,6 +74,8 @@ jobs:
           - planet-notes
           - planet-replication
           - postgresql
           - planet-notes
           - planet-replication
           - postgresql

+          - prometheus
+          - prometheus-server

           - python
           - rsyncd
           - serverinfo
           - python
           - rsyncd
           - serverinfo


@@ -82,6 +92,7 @@ jobs:
           - taginfo
           - tile
           - tilecache
           - taginfo
           - tile
           - tilecache

+          - tilelog

           - tools
           - trac
           - web-backend
           - tools
           - trac
           - web-backend


@@ -89,16 +100,23 @@ jobs:
           - web-frontend
           - web-rails
           - wordpress
           - web-frontend
           - web-rails
           - wordpress

+          - wiki

         os:
         os:

-          - ubuntu-1804
+          - ubuntu-2004
+        include:
+          - suite: trac
+            os: ubuntu-1804
+        exclude:
+          - suite: trac
+            os: ubuntu-2004

       fail-fast: false
     steps:
     - name: Check out code
       uses: actions/checkout@v2
     - name: Setup ruby
       fail-fast: false
     steps:
     - name: Check out code
       uses: actions/checkout@v2
     - name: Setup ruby

-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.2

     - name: Cache gems
     - name: Cache gems

-      uses: actions/cache@v1
+      uses: actions/cache@v2

       with:
         path: vendor/bundle
         key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
       with:
         path: vendor/bundle
         key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}


@@ -110,7 +128,8 @@ jobs:
         sudo aa-disable /usr/sbin/mysqld
     - name: Install gems
       run: |
         sudo aa-disable /usr/sbin/mysqld
     - name: Install gems
       run: |

-        gem install bundler --version "~> 1.17"
-        bundle install --jobs 4 --retry 3 --deployment
+        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 }}
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}