From 22bafe39f19c7c67ba599f7d63da11e4eaba9692 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 23 May 2025 17:14:36 +0100 Subject: [PATCH 1/2] Fix: update Test Simbank workflow with correct github.event_name for the call from the Main build Signed-off-by: Jade Carino --- .github/workflows/test.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 56d2fed..b927eae 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -91,13 +91,17 @@ jobs: #---------------------------------------------------------------------------------- # Download or build the Simplatform application that the tests connect to + + # If this workflow was called after a Main build, it will share the github.event_name + # with the calling workflow, which is 'push'. Download the artifacts from that build. - name: Download SimBank from Main Build - if: ${{ github.event_name == 'workflow_call' }} + if: ${{ github.event_name == 'push' }} uses: actions/download-artifact@v4 with: name: simplatform path: /home/runner/.m2/repository + # If this workflow was called by the daily regression test run, build the code. - name: Build SimBank using local build script if: ${{ github.event_name == 'workflow_dispatch' }} run: | From 271aa38b91ec4e876215b05872bb2d8074cc366e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 23 May 2025 17:19:35 +0100 Subject: [PATCH 2/2] Fix: remove incorrect path to write test reports to Signed-off-by: Jade Carino --- .github/workflows/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b927eae..cadd95a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -127,7 +127,7 @@ jobs: --obr mvn:dev.galasa/dev.galasa.uber.obr/${GALASA_VERSION}/obr \ --class dev.galasa.simbank.tests/dev.galasa.simbank.tests.SimBankIVT \ --remoteMaven https://development.galasa.dev/main/maven-repo/obr \ - --reportjson ${{ github.workspace }}/.galasa/temp/test-1.json \ + --reportjson ${{ github.workspace }}/.galasa/test-1.json \ --log - - name: Run the BasicAccountCreditTest @@ -139,7 +139,7 @@ jobs: --obr mvn:dev.galasa/dev.galasa.uber.obr/${GALASA_VERSION}/obr \ --class dev.galasa.simbank.tests/dev.galasa.simbank.tests.BasicAccountCreditTest \ --remoteMaven https://development.galasa.dev/main/maven-repo/obr \ - --reportjson ${{ github.workspace }}/.galasa/temp/test-2.json \ + --reportjson ${{ github.workspace }}/.galasa/test-2.json \ --log - - name: Run the ProvisionedAccountCreditTests @@ -151,7 +151,7 @@ jobs: --obr mvn:dev.galasa/dev.galasa.uber.obr/${GALASA_VERSION}/obr \ --class dev.galasa.simbank.tests/dev.galasa.simbank.tests.ProvisionedAccountCreditTests \ --remoteMaven https://development.galasa.dev/main/maven-repo/obr \ - --reportjson ${{ github.workspace }}/.galasa/temp/test-3.json \ + --reportjson ${{ github.workspace }}/.galasa/test-3.json \ --log - #---------------------------------------------------------------------------------- @@ -162,7 +162,7 @@ jobs: # a regression run as Main builds run multiple times a day. if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'workflow_dispatch' }} run: | - jq -s '{ tests: map(.tests[]) }' ${{ github.workspace }}/.galasa/temp/test-1.json ${{ github.workspace }}/.galasa/temp/test-2.json ${{ github.workspace }}/.galasa/temp/test-3.json > ${{ github.workspace }}/.galasa/temp/tests.json + jq -s '{ tests: map(.tests[]) }' ${{ github.workspace }}/.galasa/test-1.json ${{ github.workspace }}/.galasa/test-2.json ${{ github.workspace }}/.galasa/test-3.json > ${{ github.workspace }}/.galasa/tests.json - name: Report results into Slack channel # Skip this step for forks.