Simplatform PR build

.github/workflows/build.yaml

@@ -0,0 +1,129 @@
+name: Main build
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+
+env:
+  REGISTRY: ghcr.io
+  NAMESPACE: galasa-dev
+  BRANCH: ${{ github.ref_name }}
+
+jobs:
+  log-github-ref:
+    name: Log the GitHub ref this workflow is running on (Branch or tag that received dispatch)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log GitHub ref of workflow
+        run: |
+          echo "This workflow is running on GitHub ref ${{ env.BRANCH }}"
+
+  build-simplatform:
+    name: Building Simplatform web application and tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'semeru'
+
+      - name: Print Githash
+        run: |
+          echo $GITHUB_SHA > ./simplatform.githash
+
+      - name: Building galasa-simplatform-application using maven
+        run: |
+          set -o pipefail
+          mvn -f galasa-simplatform-application/pom.xml deploy -X \
+          -Dgalasa.source.repo=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/obr \
+          -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
+          -Dgalasa.release.repo=file:${{ github.workspace }}/repo \
+          --batch-mode --errors --fail-at-end \
+          --settings ${{ github.workspace }}/settings.xml 2>&1 | tee galasa-simplatform-application-build.log
+
+      - name: Upload galasa-simplatform-application Maven Build Log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: galasa-simplatform-application-build-log
+          path: galasa-simplatform-application-build.log
+          retention-days: 7
+
+      - name: Building galasa-simbank-tests using maven
+        run: |
+          set -o pipefail
+          mvn -f galasa-simbank-tests/pom.xml deploy -X \
+          -Dgalasa.source.repo=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/obr \
+          -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
+          -Dgalasa.release.repo=file:${{ github.workspace }}/repo \
+          --batch-mode --errors --fail-at-end \
+          --settings ${{ github.workspace }}/settings.xml 2>&1 | tee galasa-simbank-tests-build.log
+
+      - name: Upload galasa-simbank-tests Maven Build Log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: galasa-simbank-tests-build-log
+          path: galasa-simbank-tests-build.log
+          retention-days: 7
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Simplatform maven artefacts image
+        id: metadata-simplatform
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+            images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/simplatform-maven-artefacts
+
+      - name: Build Simplatform image for development Maven registry
+        id: build-simplatform
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: dockerfiles/dockerfile.simplatform
+          push: true
+          tags: ${{ steps.metadata-simplatform.outputs.tags }}
+          labels: ${{ steps.metadata-simplatform.outputs.labels }}
+          build-args: |
+            baseVersion=latest
+            dockerRepository=ghcr.io
+            branch=${{ env.BRANCH }}
+
+      - name: Extract metadata for Simplatform jar image
+        id: metadata-simplatform-jar
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/simplatform-jar
+
+      - name: Build simplatform jar image
+        id: build-simplatform-jar
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: dockerfiles/dockerfile.simplatform-amd64
+          push: true
+          tags: ${{ steps.metadata-simplatform-jar.outputs.tags }}
+          labels: ${{ steps.metadata-simplatform-jar.outputs.labels }}
+
+      - name: Recycle application in ArgoCD
+        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 gh-simplatform restart --kind Deployment --resource-name simplatform-gh --server argocd.galasa.dev
+
+      - name: Wait for app health in ArgoCD
+        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 gh-simplatform --resource apps:Deployment:simplatform-gh --health --server argocd.galasa.dev

.github/workflows/pr-build.yaml

@@ -0,0 +1,82 @@
+name: PR build
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-simplatform:
+    name: Build Simplatform web application and tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'semeru'
+
+      - name: Print Githash
+        run: |
+          echo $GITHUB_SHA > ./simplatform.githash
+
+      - name: Building galasa-simplatform-application using maven
+        run: |
+          set -o pipefail
+          mvn -f galasa-simplatform-application/pom.xml deploy -X \
+          -Dgpg.skip=true \
+          -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \
+          -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
+          -Dgalasa.release.repo=file:${{ github.workspace }}/repo \
+          --batch-mode --errors --fail-at-end \
+          --settings ${{ github.workspace }}/settings.xml 2>&1 | tee galasa-simplatform-application-build.log
+
+      - name: Upload galasa-simplatform-application Maven Build Log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: galasa-simplatform-application-build-log
+          path: galasa-simplatform-application-build.log
+          retention-days: 7
+
+      - name: Building galasa-simbank-tests using maven
+        run: |
+          set -o pipefail
+          mvn -f galasa-simbank-tests/pom.xml deploy -X \
+          -Dgpg.skip=true \
+          -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \
+          -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
+          -Dgalasa.release.repo=file:${{ github.workspace }}/repo \
+          --batch-mode --errors --fail-at-end \
+          --settings ${{ github.workspace }}/settings.xml 2>&1 | tee galasa-simbank-tests-build.log
+
+      - name: Upload galasa-simbank-tests Maven Build Log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: galasa-simbank-tests-build-log
+          path: galasa-simbank-tests-build.log
+          retention-days: 7
+
+      - name: Build Simplatform image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: dockerfiles/dockerfile.simplatform
+          load: true
+          tags: simplatform-maven-artefacts:test
+          build-args: |
+            baseVersion=latest
+            dockerRepository=ghcr.io
+            branch=main
+
+      - name: Build Simplatform jar image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: dockerfiles/dockerfile.simplatform-amd64
+          load: true
+          tags: simplatform-jar:test

dockerfiles/dockerfile.simplatform

@@ -0,0 +1,11 @@
+ARG baseVersion
+ARG dockerRepository
+FROM ${dockerRepository}/galasa-dev/base-image:${baseVersion}
+
+ARG branch
+
+RUN sed -i "s/--branchname--/${branch}/"    /usr/local/apache2/conf/httpd.conf
+RUN sed -i 's/--repositoryname--/simplatform/'  /usr/local/apache2/conf/httpd.conf
+
+COPY repo/ /usr/local/apache2/htdocs/
+COPY simplatform.githash /usr/local/apache2/htdocs/simplatform.githash

dockerfiles/dockerfile.simplatform-amd64

@@ -0,0 +1,20 @@
+FROM harbor.galasa.dev/docker_proxy_cache/library/openjdk:11-jdk
+
+RUN mkdir /galasa
+
+RUN useradd -u 1000 -d /galasa galasa              && \
+    chown -R galasa:galasa /galasa
+
+WORKDIR /galasa
+
+USER galasa
+
+COPY galasa-simplatform-application/galasa-simplatform-3270/target/galasa-simplatform-0.38.0.jar /galasa/simplatform.jar
+
+VOLUME /galasa/.galasa
+VOLUME /galasa/load
+
+EXPOSE 2080/tcp
+EXPOSE 2023/tcp
+EXPOSE 2027/tcp
+EXPOSE 2040/tcp

galasa-simbank-tests/dev.galasa.simbank.gherkin.tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.galasa</groupId>
     <artifactId>galasa-simbanktests-parent</artifactId>
-    <version>0.25.0</version>
+    <version>0.38.0</version>
   </parent>
 
   <artifactId>dev.galasa.simbank.gherkin.tests</artifactId>

galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml

@@ -23,7 +23,7 @@
 			<dependency>
 				<groupId>dev.galasa</groupId>
 				<artifactId>galasa-bom</artifactId>
-				<version>0.25.0</version>
+				<version>0.38.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

galasa-simbank-tests/dev.galasa.simbank.manager/pom.xml

@@ -4,14 +4,14 @@
 	<parent>
 		<groupId>dev.galasa</groupId>
 		<artifactId>galasa-simbanktests-parent</artifactId>
-		<version>0.25.0</version>
+		<version>0.38.0</version>
 	</parent>
 
 	<name>Galasa SimBank Manager</name>
 
 	<artifactId>dev.galasa.simbank.manager</artifactId>
 	<version>0.25.0</version>
-	<!-- If updating version, reflect in dev.galasa.simbank.feature, dev.galasa.simbank.tests and dev.galasa.simbank.obr -->
+	<!-- If updating version, reflect in dev.galasa.simbank.tests and dev.galasa.simbank.obr -->
 	<packaging>bundle</packaging>
 
 	<dependencies>

galasa-simbank-tests/dev.galasa.simbank.obr/pom.xml

@@ -6,14 +6,13 @@
 	<parent>
 		<groupId>dev.galasa</groupId>
 		<artifactId>galasa-simbanktests-parent</artifactId>
-		<version>0.25.0</version>
+		<version>0.38.0</version>
 	</parent>
 
 	<name>Galasa SimBank OBR</name>
 
 	<artifactId>dev.galasa.simbank.obr</artifactId>
-	<version>0.25.0</version>
-	<!-- If updating version, reflect change in build/docker/testcatalogs/pom.xml -->
+	<version>0.38.0</version>
 	<packaging>galasa-obr</packaging>
 
 	<properties>
@@ -25,7 +24,7 @@
 		<dependency>
 			<groupId>dev.galasa</groupId>
 			<artifactId>dev.galasa.simbank.tests</artifactId>
-			<version>0.25.0</version>
+			<version>0.38.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml

@@ -23,7 +23,7 @@
 			<dependency>
 				<groupId>dev.galasa</groupId>
 				<artifactId>galasa-bom</artifactId>
-				<version>0.25.0</version>
+				<version>0.38.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

galasa-simbank-tests/dev.galasa.simbank.tests/pom.xml

@@ -4,14 +4,14 @@
 	<parent>
 		<groupId>dev.galasa</groupId>
 		<artifactId>galasa-simbanktests-parent</artifactId>
-		<version>0.25.0</version>
+		<version>0.38.0</version>
 	</parent>
 
 	<name>Galasa SimBank Example Tests</name>
 
 	<artifactId>dev.galasa.simbank.tests</artifactId>
-	<version>0.25.0</version>
-	<!-- If updating version, reflect in dev.galasa.simbank.feature and dev.galasa.simbank.obr -->
+	<version>0.38.0</version>
+	<!-- If updating version, reflect in dev.galasa.simbank.obr -->
 	<packaging>bundle</packaging>
 
 	<dependencies>

galasa-simbank-tests/dev.galasa.simbank.tests/src/main/java/dev/galasa/simbank/tests/SimBankIVT.java

@@ -8,15 +8,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import dev.galasa.Test;
-import dev.galasa.artifact.BundleResources;
-import dev.galasa.artifact.IBundleResources;
 import dev.galasa.core.manager.CoreManager;
 import dev.galasa.core.manager.ICoreManager;
-import dev.galasa.http.HttpClient;
-import dev.galasa.http.IHttpClient;
 import dev.galasa.zos.IZosImage;
 import dev.galasa.zos.ZosImage;
-import dev.galasa.zos.ZosManagerException;
 import dev.galasa.zos3270.ITerminal;
 import dev.galasa.zos3270.Zos3270Terminal;
 
@@ -29,12 +24,6 @@ public class SimBankIVT {
     @Zos3270Terminal(imageTag = "SIMBANK")
     public ITerminal        terminal;
 
-    @BundleResources
-    public IBundleResources resources;
-
-    @HttpClient
-    public IHttpClient      client;
-
     @CoreManager
     public ICoreManager     coreManager;
 
@@ -50,7 +39,7 @@ public class SimBankIVT {
      * @throws Exception
      */
     @Test
-    public void checkBankIsAvailable() throws Exception{
+    public void checkBankIsAvailable() throws Exception {
         // Register the password to the confidential text filtering service
         coreManager.registerConfidentialText("SYS1", "IBMUSER password");