From 9b95631fb47905a32ea0e27261147f5dc648dbc4 Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Fri, 6 Jun 2025 14:18:19 +0100 Subject: [PATCH 1/5] Update Test Simbank workflow (#192) * Update Test Simbank workflow - change test report steps to only run if the workflow was on 'schedule' so we dont get a report after every main build Signed-off-by: Jade Carino * Remove workflow_dispatch event Signed-off-by: Jade Carino --------- Signed-off-by: Jade Carino --- .github/workflows/test.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 94a4cfd..c5afbfc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,10 +8,8 @@ name: Test SimBank on: # This workflow_call is used after the Main Build of Simplatform. workflow_call: - # This workflow_dispatch allows this workflow to be called by a - # scheduled regression run in the Automation repository. It also - # allows this workflow to be called by pressing 'Run Workflow'. - workflow_dispatch: + schedule: + - cron: "0 6 * * *" # Daily at 06:00 env: NAMESPACE: ${{ github.repository_owner }} @@ -101,7 +99,7 @@ jobs: # 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' }} + if: ${{ github.event_name == 'schedule' }} run: | ./build-locally.sh --skip-docker --skip-secrets @@ -157,7 +155,7 @@ jobs: # Skip these steps for forks. Only report results if this workflow was # called from a regression run as Main builds run multiple times a day. - name: Combine test reports - if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'workflow_dispatch' }} + if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'schedule' }} run: | 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 @@ -165,7 +163,7 @@ jobs: # We need to run a Docker image to communicate with the Slack webhook and the macos-latest # runner does not have `docker` installed. Upload the report and download in the next job. - name: Upload combined test report - if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'workflow_dispatch' }} + if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'schedule' }} uses: actions/upload-artifact@v4 with: name: tests.json @@ -177,7 +175,7 @@ jobs: # Skip this job for forks. Only report results if this workflow was # called from a regression run as Main builds run multiple times a day. - if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'workflow_dispatch' }} + if: ${{ github.repository_owner == 'galasa-dev' && github.event_name == 'schedule' }} needs: [build-and-run-simbank-tests] From ee4e86b2869d6c58e10c19b76afc16e03f3e5949 Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Wed, 11 Jun 2025 13:10:57 +0100 Subject: [PATCH 2/5] fix: add missing workflow_dispatch trigger to Test Simbank workflow (#194) Signed-off-by: Jade Carino --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c5afbfc..c917010 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,6 +6,8 @@ name: Test SimBank on: + # This workflow_dispatch is used in the release process. + workflow_dispatch: # This workflow_call is used after the Main Build of Simplatform. workflow_call: schedule: From ec3c0218a5532e3a1e7b9415bc0701a5f638b5f6 Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Thu, 12 Jun 2025 12:20:50 +0100 Subject: [PATCH 3/5] fix: fix test simbank workflow, should build the simbank tests if workflow is called from the release process (#195) Signed-off-by: Jade Carino --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c917010..f53fb37 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -99,9 +99,9 @@ jobs: name: simplatform path: ${{ env.HOME }}/.m2/repository - # If this workflow was called by the daily regression test run, build the code. + # If this workflow was called by the daily regression test run or the release, build the code. - name: Build SimBank using local build script - if: ${{ github.event_name == 'schedule' }} + if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} run: | ./build-locally.sh --skip-docker --skip-secrets From b41e40e26a8efa30a47f49a71196cb66a8b68ff7 Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Fri, 13 Jun 2025 10:30:20 +0100 Subject: [PATCH 4/5] Uplift development version to 0.43.0 (#196) Signed-off-by: Jade Carino --- dockerfiles/dockerfile.simplatform-amd64 | 2 +- .../dev.galasa.simbank.gherkin.tests/pom.xml | 4 ++-- .../dev.galasa.simbank.manager/pom-example.xml | 2 +- galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml | 4 ++-- galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml | 8 ++++---- .../dev.galasa.simbank.tests/pom-example.xml | 2 +- galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml | 6 +++--- galasa-simbank-tests/pom.xml | 6 +++--- .../galasa-simplatform-3270/Dockerfile | 2 +- .../galasa-simplatform-3270/pom.xml | 4 ++-- .../galasa-simplatform-webapp/pom.xml | 4 ++-- galasa-simplatform-application/pom.xml | 4 ++-- run-locally.sh | 2 +- test-locally.sh | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dockerfiles/dockerfile.simplatform-amd64 b/dockerfiles/dockerfile.simplatform-amd64 index 7b995c2..cae95c8 100644 --- a/dockerfiles/dockerfile.simplatform-amd64 +++ b/dockerfiles/dockerfile.simplatform-amd64 @@ -9,7 +9,7 @@ WORKDIR /galasa USER galasa -COPY galasa-simplatform-application/galasa-simplatform-3270/target/galasa-simplatform-0.42.0.jar /galasa/simplatform.jar +COPY galasa-simplatform-application/galasa-simplatform-3270/target/galasa-simplatform-0.43.0.jar /galasa/simplatform.jar VOLUME /galasa/.galasa VOLUME /galasa/load diff --git a/galasa-simbank-tests/dev.galasa.simbank.gherkin.tests/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.gherkin.tests/pom.xml index 5b23f56..78d2ba3 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.gherkin.tests/pom.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.gherkin.tests/pom.xml @@ -4,11 +4,11 @@ dev.galasa galasa-simbanktests-parent - 0.42.0 + 0.43.0 dev.galasa.simbank.gherkin.tests - 0.42.0 + 0.43.0 galasa-gherkin \ No newline at end of file diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml index 21782c4..a9d09c2 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml @@ -23,7 +23,7 @@ dev.galasa galasa-bom - 0.42.0 + 0.43.0 pom import diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml index 7887e18..1eb0739 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml @@ -4,13 +4,13 @@ dev.galasa galasa-simbanktests-parent - 0.42.0 + 0.43.0 Galasa SimBank Manager dev.galasa.simbank.manager - 0.42.0 + 0.43.0 bundle diff --git a/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml index cf745c0..4f46cde 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml @@ -6,13 +6,13 @@ dev.galasa galasa-simbanktests-parent - 0.42.0 + 0.43.0 Galasa SimBank OBR dev.galasa.simbank.obr - 0.42.0 + 0.43.0 galasa-obr @@ -25,13 +25,13 @@ dev.galasa dev.galasa.simbank.tests - 0.42.0 + 0.43.0 compile dev.galasa dev.galasa.simbank.manager - 0.42.0 + 0.43.0 compile diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml index f50cc2a..608cef4 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml @@ -23,7 +23,7 @@ dev.galasa galasa-bom - 0.42.0 + 0.43.0 pom import diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml b/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml index b2db669..60698d6 100644 --- a/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml +++ b/galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml @@ -4,13 +4,13 @@ dev.galasa galasa-simbanktests-parent - 0.42.0 + 0.43.0 Galasa SimBank Example Tests dev.galasa.simbank.tests - 0.42.0 + 0.43.0 bundle @@ -18,7 +18,7 @@ dev.galasa dev.galasa.simbank.manager - 0.42.0 + 0.43.0 provided diff --git a/galasa-simbank-tests/pom.xml b/galasa-simbank-tests/pom.xml index 80fa46c..11a032a 100644 --- a/galasa-simbank-tests/pom.xml +++ b/galasa-simbank-tests/pom.xml @@ -3,7 +3,7 @@ dev.galasa galasa-simbanktests-parent - 0.42.0 + 0.43.0 pom @@ -77,7 +77,7 @@ dev.galasa galasa-bom - 0.42.0 + 0.43.0 pom import @@ -191,7 +191,7 @@ dev.galasa galasa-maven-plugin - 0.42.0 + 0.43.0 org.eclipse.m2e diff --git a/galasa-simplatform-application/galasa-simplatform-3270/Dockerfile b/galasa-simplatform-application/galasa-simplatform-3270/Dockerfile index 62ab726..bdb29a2 100644 --- a/galasa-simplatform-application/galasa-simplatform-3270/Dockerfile +++ b/galasa-simplatform-application/galasa-simplatform-3270/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /galasa USER galasa -COPY target/galasa-simplatform-0.42.0.jar /galasa/simplatform.jar +COPY target/galasa-simplatform-0.43.0.jar /galasa/simplatform.jar VOLUME /galasa/.galasa VOLUME /galasa/load diff --git a/galasa-simplatform-application/galasa-simplatform-3270/pom.xml b/galasa-simplatform-application/galasa-simplatform-3270/pom.xml index d45f581..2ae701b 100644 --- a/galasa-simplatform-application/galasa-simplatform-3270/pom.xml +++ b/galasa-simplatform-application/galasa-simplatform-3270/pom.xml @@ -4,12 +4,12 @@ dev.galasa galasa-simplatform-parent - 0.42.0 + 0.43.0 dev.galasa galasa-simplatform - 0.42.0 + 0.43.0 jar diff --git a/galasa-simplatform-application/galasa-simplatform-webapp/pom.xml b/galasa-simplatform-application/galasa-simplatform-webapp/pom.xml index b83d579..adef890 100644 --- a/galasa-simplatform-application/galasa-simplatform-webapp/pom.xml +++ b/galasa-simplatform-application/galasa-simplatform-webapp/pom.xml @@ -6,12 +6,12 @@ dev.galasa galasa-simplatform-parent - 0.42.0 + 0.43.0 dev.galasa galasa-simplatform-webapp - 0.42.0 + 0.43.0 war galasa-simplatform-webapp Maven Webapp diff --git a/galasa-simplatform-application/pom.xml b/galasa-simplatform-application/pom.xml index ef66b2f..f584993 100644 --- a/galasa-simplatform-application/pom.xml +++ b/galasa-simplatform-application/pom.xml @@ -3,7 +3,7 @@ dev.galasa galasa-simplatform-parent - 0.42.0 + 0.43.0 pom Galasa SimPlatform @@ -85,7 +85,7 @@ dev.galasa galasa-bom - 0.42.0 + 0.43.0 pom import diff --git a/run-locally.sh b/run-locally.sh index a2df59d..85c5a67 100755 --- a/run-locally.sh +++ b/run-locally.sh @@ -111,7 +111,7 @@ fi # Main logic. #----------------------------------------------------------------------------------------- -SIMBANK_VERSION="0.42.0" +SIMBANK_VERSION="0.43.0" function run_server { h1 "Running Simbank back-end server application (version ${SIMBANK_VERSION}) ..." diff --git a/test-locally.sh b/test-locally.sh index 281abb7..7431068 100755 --- a/test-locally.sh +++ b/test-locally.sh @@ -181,7 +181,7 @@ function runProvisionedAccountCreditTests { source_dir="." project=$(basename ${BASEDIR}) -SIMBANK_VERSION="0.42.0" +SIMBANK_VERSION="0.43.0" checkGalasaCtlAvailable checkSimBankTestAreBuilt @@ -197,7 +197,7 @@ java -jar ~/.m2/repository/dev/galasa/galasa-simplatform/${SIMBANK_VERSION}/gala success "Simbank application started OK." -TEST_OBR_VERSION="0.42.0" +TEST_OBR_VERSION="0.43.0" h1 "Running Simbank tests" From 4a676b89c6bf8f5071e4fba99465f755e188fef7 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 23 Jul 2025 15:05:16 +0100 Subject: [PATCH 5/5] build: Add retry loop when sending requests to argocd.galasa.dev in case of intermittent 502 error Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 80219e4..84968f4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -138,15 +138,42 @@ jobs: env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.BRANCH }}-simplatform restart --kind Deployment --resource-name simplatform-${{ env.BRANCH }} --server argocd.galasa.dev - + for i in {1..10}; do + docker run \ + --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} \ + --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main \ + app actions run ${{ env.BRANCH }}-simplatform restart \ + --kind Deployment \ + --resource-name \ + simplatform-${{ env.BRANCH }} \ + --server argocd.galasa.dev \ + --grpc-web \ + && exit 0 || sleep 10 + done + + echo "ArgoCD still uncontactable after 10 attempts." + exit 1 + - name: Wait for app health in ArgoCD # Skip this step for forks if: ${{ github.repository_owner == 'galasa-dev' }} env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.BRANCH }}-simplatform --resource apps:Deployment:simplatform-${{ env.BRANCH }} --health --server argocd.galasa.dev + for i in {1..10}; do + docker run \ + --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} \ + --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main \ + app wait ${{ env.BRANCH }}-simplatform \ + --resource apps:Deployment:simplatform-${{ env.BRANCH }} \ + --health \ + --server argocd.galasa.dev \ + --grpc-web \ + && exit 0 || sleep 10 + done + + echo "ArgoCD still uncontactable after 10 attempts." + exit 1 run-simbank-tests: name: Run the SimBank Tests