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
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 94a4cfd..f53fb37 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,12 +6,12 @@
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:
- # 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 }}
@@ -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 == 'workflow_dispatch' }}
+ if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
run: |
./build-locally.sh --skip-docker --skip-secrets
@@ -157,7 +157,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 +165,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 +177,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]
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"