make integration test reusable

.github/workflows/_integration_test_shared.yml

@@ -0,0 +1,38 @@
+name: Reusable Integration Tests
+
+on:
+  workflow_call:
+    inputs:
+      test_directory:
+        description: 'The directory to run tests from.'
+        required: true
+        type: string
+      split_test_into_groups:
+        description: 'Use split matrix'
+        required: false
+        type: boolean
+
+jobs:
+  run-integration-tests:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        split_group: ${{ inputs.split_test_into_groups && [ "1", "2", "3", "4", "5" ] || [ "1" ] }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-python/
+      - run: poetry install
+      - run: |
+          if [ -n "${{ inputs.split_group }}" ]; then
+            poetry run pytest ${{ inputs.test_directory }} --durations=0 -m 'integration' --junitxml=report.xml --splits 5 --group ${{ matrix.split_group }} --junitxml=report-${{ matrix.split_group }}.xml
+          else
+            poetry run pytest ${{ inputs.test_directory }}  --durations=0 -m 'integration' --junitxml=report.xml -s --log-cli-level=INFO --junitxml=report-1.xml
+          fi
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v4
+        if: always()
+        with:
+          commit: ${{github.event.workflow_run.head_sha}}
+          report_paths: "report*.xml"

.github/workflows/integration-tests.yml

@@ -59,25 +59,16 @@ jobs:
   integration-tests:
     needs: [detect-version-changed, build-and-push-truss-base-images-if-needed]
     if: ${{ !failure() && !cancelled() && (needs.build-and-push-truss-base-images-if-needed.result == 'success' || needs.build-and-push-truss-base-images-if-needed.result == 'skipped') }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        split_group: [ "1", "2", "3", "4", "5" ]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-python/
-      - run: poetry install
-      - run: poetry run pytest truss/tests --durations=0 -m 'integration' --splits 5 --group ${{ matrix.split_group }}"
+    uses: ./.github/workflows/_integration_test_shared.yml@${{ github.ref }}
+    with:
+      test_directory: "truss/tests"
+      split_test_into_groups: true
+
 
   chain-integration-tests:
     needs: [detect-version-changed, build-and-push-truss-base-images-if-needed]
     if: ${{ !failure() && !cancelled() && (needs.build-and-push-truss-base-images-if-needed.result == 'success' || needs.build-and-push-truss-base-images-if-needed.result == 'skipped') }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-python/
-      - run: poetry install
-      - run: poetry run pytest truss-chains/tests -s --log-cli-level=INFO  --durations=0 -m 'integration'
+    uses: ./_integration_test_shared.yml@${{ github.ref }}
+    with:
+      test_directory: "truss-chains/tests"
+      split_test_into_groups: false

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: main - post-commit
+name: Main - post-commit
 
 on:
   workflow_dispatch: # Allows running from actions tab
@@ -62,29 +62,18 @@ jobs:
   integration-tests:
     needs: [detect-version-changed, build-and-push-truss-base-images-if-needed]
     if: ${{ !failure() && !cancelled() && (needs.build-and-push-truss-base-images-if-needed.result == 'success' || needs.build-and-push-truss-base-images-if-needed.result == 'skipped') }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        split_group: [ "1", "2", "3", "4", "5" ]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-python/
-      - run: poetry install
-      - run: poetry run pytest truss/tests --durations=0 -m 'integration' --splits 5 --group ${{ matrix.split_group }}
+    uses: ./.github/workflows/_integration_test_shared.yml@${{ github.ref }}
+    with:
+      test_directory: "truss/tests"
+      split_test_into_groups: true
 
   chain-integration-tests:
     needs: [detect-version-changed, build-and-push-truss-base-images-if-needed]
     if: ${{ !failure() && !cancelled() && (needs.build-and-push-truss-base-images-if-needed.result == 'success' || needs.build-and-push-truss-base-images-if-needed.result == 'skipped') }}
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-python/
-      - run: poetry install
-      - run: poetry run pytest truss-chains/tests -s --log-cli-level=INFO  --durations=0 -m 'integration'
-
+    uses: ./_integration_test_shared.yml@${{ github.ref }}
+    with:
+      test_directory: "truss-chains/tests"
+      split_test_into_groups: false
   publish-to-pypi:
     needs: [detect-version-changed]
     if: ${{ !failure() && !cancelled() && needs.detect-version-changed.outputs.release_version == 'true' && needs.detect-version-changed.outputs.is_prerelease_version == 'true' }}

.github/workflows/pr.yml

@@ -34,13 +34,6 @@ jobs:
       - run: poetry install
       - name: run tests (poetry run pytest...)
         run: poetry run pytest -v --cov=truss -m 'not integration' --junitxml=report.xml
-
-      - name: Store Test Report
-        uses: actions/upload-artifact@v4
-        with:
-          name: report.xml
-          path: report.xml
-
       - name: Publish Test Report  # Not sure how to display this in the UI for non PRs.
         uses: mikepenz/action-junit-report@v4
         if: always()