Merge branch 'main' into fix-regression-cronjob

.github/workflows/base-image.yaml

@@ -43,3 +43,16 @@ jobs:
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
+
+  report-failure:
+    name: Report failure in workflow
+    runs-on: ubuntu-latest
+    needs: build-base-image
+    if: failure()
+
+    steps:
+      - name: Report failure in workflow to Slack
+        env: 
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        run : |
+          docker run --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/galasabld-ibm:main slackpost workflows --repo "automation" --workflowName "${{ github.workflow }}" --workflowRunNum "${{ github.run_id }}" --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}"

.github/workflows/build-automation.yaml

@@ -318,3 +318,16 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  report-failure:
+    name: Report failure in workflow
+    runs-on: ubuntu-latest
+    needs: [build-gpg-image, build-kubectl-image, build-argocdcli-image, build-gitcli-image, build-openapi-image, build-swagger-image, build-openjdk17-ibm-gradle-image]
+    if: failure()
+
+    steps:
+      - name: Report failure in workflow to Slack
+        env: 
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        run : |
+          docker run --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/galasabld-ibm:main slackpost workflows --repo "automation" --workflowName "${{ github.workflow }}" --workflowRunNum "${{ github.run_id }}" --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}"

.github/workflows/build-helm.yaml

@@ -47,4 +47,17 @@ jobs:
 
       - name: Test ecosystem1
         run: |
-          helm test main-ecosystem --namespace=galasa-ecosystem1 --kubeconfig $HOME/.kube/config
+          helm test main-ecosystem --namespace=galasa-ecosystem1 --kubeconfig $HOME/.kube/config
+
+  report-failure:
+    name: Report failure in workflow
+    runs-on: ubuntu-latest
+    needs: build-helm
+    if: failure()
+
+    steps:
+      - name: Report failure in workflow to Slack
+        env: 
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        run : |
+          docker run --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/galasabld-ibm:main slackpost workflows --repo "automation" --workflowName "${{ github.workflow }}" --workflowRunNum "${{ github.run_id }}" --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}"

README.md

@@ -44,7 +44,6 @@ This directory is the single location for all Dockerfiles needed to build the im
 | Base image (Most other images are built on top of this. Used to enable use of the Apache HTTP Server) | base |
 | Maven repositories for the built Galasa core components | cli-binary |
 | Galasa CLI | cli, cli-ibm |
-| Galasa Simplatform | simplatform, simplatform-amd64, webapp |
 | Galasa Resources site | resources |
 
 
@@ -103,6 +102,8 @@ This EventListener is triggered via webhook when code is pushed into the main br
 
 ## Pipelines
 
+**TO DO: Remove this section / update with GitHub workflows**
+
 Galasa's architecture means that the core components are built on top of each other, using artifacts from the previous components. The diagram below shows the links between components, starting from Wrapping. In some instances, the build pipeline for a component triggers the next pipeline in the chain, and in some instances, the component is not connected in the chain, but when it is rebuilt, it draws on artifacts from the other.
 
 In the pipelines, you will see that during some of the Maven or Gradle builds, the Maven source is pointed at the Maven artifact repository of the previous component. So, Framework's Gradle build has the build argument _-PsourceMaven=https://development.galasa.dev/main/maven-repo/maven_ so it can use artifacts from Maven's build.

infrastructure/cicsk8s/galasa-dev/regression-test.yaml

@@ -40,7 +40,7 @@ spec:
             - rm
             - -rf
             - /galasa/*
-            image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
+            image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
             imagePullPolicy: Always
             resources: {}
             terminationMessagePath: /dev/termination-log
@@ -68,7 +68,7 @@ spec:
             - compilation
             - --log
             - '-'
-            image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
+            image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
             imagePullPolicy: IfNotPresent
             resources: {}
             terminationMessagePath: /dev/termination-log
@@ -141,7 +141,7 @@ spec:
             - --noexitcodeontestfailures
             - --log
             - '-'
-            image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
+            image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
             imagePullPolicy: IfNotPresent
             resources: {}
             terminationMessagePath: /dev/termination-log

infrastructure/cicsk8s/galasa-prod/galasa-prod/simbank.yaml

@@ -27,7 +27,7 @@ spec:
         applevel: critical
       containers:
       - name: simbank
-        image: harbor.galasa.dev/galasadev/galasa-simplatform-amd64:main
+        image: ghcr.io/galasa-dev/simplatform-jar:main
         imagePullPolicy: Always
         command: ["java"]
         args: 

infrastructure/galasa-plan-b-lon02/argo-app-create.sh

@@ -135,8 +135,6 @@ function delete_application {
 # delete_application "main-bld"
 # delete_application "main-inttests"
 # delete_application "main-simplatform"
-# delete_application "prod-simplatform"
-# delete_application "prod-maven-repos"
 # delete_application "galasa-development-namespace"
 delete_application "galasa-ecosystem1"
 create_application "galasa-ecosystem1" \
@@ -186,10 +184,6 @@ create_application "galasa-ecosystem1" \
 #     "galasa-development/simplatform" \
 #     "values-used-by-different-argo-apps/main-simplatform-values.yaml"
 
-# create_helm_application "prod-simplatform" \
-#     "galasa-development/simplatform" \
-#     "values-used-by-different-argo-apps/prod-simplatform-values.yaml"
-
 # create_helm_application "prod-maven-repos" \
 #     "galasa-development/branch-maven-repository" \
 #     "values-used-by-different-argo-apps/prod-maven-repos.yaml"

infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values-used-by-different-argo-apps/main-simplatform-values.yaml

@@ -6,5 +6,5 @@
 
 namespace: galasa-development
 branch: main
-imageName: harbor.galasa.dev/galasadev/galasa-simplatform
+imageName: ghcr.io/galasa-dev/simplatform-maven-artefacts
 imageTag: main

infrastructure/galasa-plan-b-lon02/galasa-development/simplatform/values.yaml

@@ -6,5 +6,5 @@
 
 namespace: galasa-development
 branch: main
-imageName: harbor.galasa.dev/galasadev/galasa-simplatform
+imageName: ghcr.io/galasa-dev/simplatform-maven-artefacts
 imageTag: main

pipelines/pipelines/dummy-pipelines/dummy-pipelines.yaml

@@ -675,6 +675,53 @@ metadata:
   # Tell ArgoCD never to prune this pipeline definition.
   annotations:
     argocd.argoproj.io/sync-options: Prune=false
+spec:
+  workspaces:
+  - name: git-workspace
+
+---
+
+apiVersion: tekton.dev/v1
+kind: Pipeline
+metadata:
+  name: pr-simplatform
+  namespace: galasa-build
+  # Tell ArgoCD never to prune this pipeline definition.
+  annotations:
+    argocd.argoproj.io/sync-options: Prune=false
+spec:
+  workspaces:
+  - name: git-workspace
+  params:
+  - name: headRef
+    type: string
+  - name: headSha
+    type: string
+  - name: baseRef
+    type: string
+  - name: prUrl
+    type: string
+  - name: statusesUrl
+    type: string
+  - name: issueUrl
+    type: string
+  - name: userId
+    type: string
+  - name: prNumber
+    type: string
+  - name: action
+    type: string
+
+---
+
+apiVersion: tekton.dev/v1
+kind: Pipeline
+metadata:
+  name: branch-simplatform
+  namespace: galasa-build
+  # Tell ArgoCD never to prune this pipeline definition.
+  annotations:
+    argocd.argoproj.io/sync-options: Prune=false
 spec:
   workspaces:
   - name: git-workspace