#2451 run docker tests as separate job

Camelcade · Mar 5, 2023 · 1a8f812 · 1a8f812
1 parent af55b00
commit 1a8f812
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/_coverage.yml b/.github/workflows/_coverage.yml
@@ -45,9 +45,16 @@ jobs:
 
       - uses: actions/download-artifact@v3
         if: ${{ env.COVERALLS_REPO_TOKEN }}
-        name: Download Integration Tests Coverage
+        name: Download Integration Tests Coverage (linux local)
         with:
-          name: integration-tests-coverage
+          name: integration-tests-coverage-linux-local
+          path: ./coverage/integration
+
+      - uses: actions/download-artifact@v3
+        if: ${{ env.COVERALLS_REPO_TOKEN }}
+        name: Download Integration Tests Coverage (linux docker)
+        with:
+          name: integration-tests-coverage-linux-docker
           path: ./coverage/integration
 
       - name: Build Jar

diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml
@@ -3,18 +3,36 @@ name: Integration Tests
 
 on:
   workflow_call:
+    inputs:
+      title:
+        required: true
+        type: string
+        description: 'Job name'
+      results_suffix:
+        required: true
+        type: string
+        description: 'Suffix for artifacts name: test results and coverage'
+      os:
+        required: true
+        type: string
+        description: 'Os to run on'
+      configurators:
+        required: true
+        type: string
+        description: 'Configurators to use for running tests'
 
 jobs:
-  build-plugins:
-    name: Integration
-    runs-on: ubuntu-latest
+  integration:
+    name: ${{ inputs.title }}
+    runs-on: ${{ inputs.os }}
     env:
       ORG_GRADLE_PROJECT_downloadIdeaSources: false
       CI: GitHub
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       PERL_TEST_VERSION: 5.36.0
       TEST_PERL_MODULES: Mojolicious HURRICUP/Devel-Camelcadedb-v2023.1.tar.gz Devel::Cover JSON App::Prove::Plugin::PassEnv TAP::Formatter::Camelcade Devel::NYTProf Perl::Tidy Perl::Critic B::Debug Types::Serialiser
+      PERL_CONFIGURATORS: ${{ inputs.configurators }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -100,7 +118,7 @@ jobs:
       - name: Upload Tests Results
         uses: actions/upload-artifact@v3
         with:
-          name: integration-test-results
+          name: integration-test-results-${{ inputs.results_suffix }}
           path: |
             **/build/test-results/*
             **/build/reports/tests/*
@@ -109,6 +127,6 @@ jobs:
         if: ${{ env.COVERALLS_REPO_TOKEN }}
         uses: actions/upload-artifact@v3
         with:
-          name: integration-tests-coverage
+          name: integration-tests-coverage-${{ inputs.results_suffix }}
           path: |
             **/jacoco/*.exec
diff --git a/.github/workflows/push_and_pr.yml b/.github/workflows/push_and_pr.yml
@@ -35,18 +35,33 @@ jobs:
     name: Tests
     uses: ./.github/workflows/_heavy_tests.yml
     secrets: inherit
-  integration-tests:
+  integration-tests-linux-local:
     needs: build
     name: Tests
     uses: ./.github/workflows/_integration_tests.yml
+    with:
+      title: Linux, Local
+      results_suffix: linux-local
+      os: ubuntu-latest
+      configurators: LOCAL_ASDF,LOCAL_PERLBREW,LOCAL_PERLBREW_WITH_LIBS,LOCAL_PLENV
+    secrets: inherit
+  integration-tests-linux-docker:
+    needs: build
+    name: Tests
+    uses: ./.github/workflows/_integration_tests.yml
+    with:
+      title: Linux, Docker
+      results_suffix: linux-docker
+      os: ubuntu-latest
+      configurators: DOCKER_SYSTEM
     secrets: inherit
   plugins:
-    needs: [ light-tests, heavy-tests, integration-tests ]
+    needs: [ light-tests, heavy-tests, integration-tests-linux-local, integration-tests-linux-docker ]
     name: Plugins
     uses: ./.github/workflows/_build_plugins.yml
     secrets: inherit
   coverage:
-    needs: [ light-tests, heavy-tests, integration-tests ]
+    needs: [ light-tests, heavy-tests, integration-tests-linux-local, integration-tests-linux-docker ]
     name: Coverage
     uses: ./.github/workflows/_coverage.yml
     secrets: inherit