Drop apparmor hack from test-kitchen action

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

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 8bb8dcc154b8452ee1a363cb1003d250e9251579..55c525f64d21e7ddbea90e252a780eb1b46add00 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -1,7 +1,13 @@
 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


@@ -93,7 +99,6 @@ jobs:
           - tilelog
           - tools
           - trac
           - tilelog
           - tools
           - trac

-          - web-backend

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


@@ -109,9 +114,5 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
       uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true

-    - name: Disable apparmor for mysqld
-      run: |
-        sudo apt-get install apparmor-utils
-        sudo aa-disable /usr/sbin/mysqld

     - 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 }}