Merge pull request #47104 from rumpl/run-snapshotter-linux-tests

ci: Always run snapshotter tests on Linux

.github/workflows/.test.yml

@@ -23,7 +23,7 @@ env:
 jobs:
   unit:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     steps:
       -
@@ -72,7 +72,7 @@ jobs:
 
   unit-report:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 10
     if: always()
     needs:
@@ -100,7 +100,7 @@ jobs:
 
   docker-py:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     steps:
       -
@@ -152,7 +152,7 @@ jobs:
 
   integration-flaky:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     steps:
       -
@@ -180,7 +180,7 @@ jobs:
 
   integration:
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     strategy:
       fail-fast: false
@@ -269,7 +269,7 @@ jobs:
 
   integration-report:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 10
     if: always()
     needs:
@@ -297,7 +297,7 @@ jobs:
 
   integration-cli-prepare:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     outputs:
       matrix: ${{ steps.tests.outputs.matrix }}
     steps:
@@ -332,7 +332,7 @@ jobs:
 
   integration-cli:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     needs:
       - integration-cli-prepare
@@ -403,7 +403,7 @@ jobs:
 
   integration-cli-report:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ inputs.storage == 'snapshotter' && github.event_name != 'pull_request' }}
+    continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 10
     if: always()
     needs:

.github/workflows/test.yml

@@ -52,20 +52,17 @@ jobs:
             *.cache-to=type=gha,scope=dev${{ matrix.mode }},mode=max
             *.output=type=cacheonly
 
-  test-prepare:
-    uses: ./.github/workflows/.test-prepare.yml
-    needs:
-      - validate-dco
-
   test:
     needs:
-      - test-prepare
       - build-dev
+      - validate-dco
     uses: ./.github/workflows/.test.yml
     strategy:
       fail-fast: false
       matrix:
-        storage: ${{ fromJson(needs.test-prepare.outputs.matrix) }}
+        storage:
+          - graphdriver
+          - snapshotter
     with:
       storage: ${{ matrix.storage }}