From 4bb9e28c72da8bd3b8b30653db21ed02bb074ff2 Mon Sep 17 00:00:00 2001
From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
Date: Wed, 25 Sep 2024 11:56:36 +0100
Subject: [PATCH] Parameterise gradle image and inttests path suffix (#615)

Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
---
 .../galasa-development/inttests/templates/ingress.yaml       | 2 +-
 .../galasa-development/inttests/values.yaml                  | 3 ++-
 pipelines/tasks/gradle-build.yaml                            | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml
index 76689d07..5b15f3ee 100644
--- a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml
+++ b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml
@@ -26,5 +26,5 @@ spec:
             name: inttests-{{ .Values.branch }}
             port:
               number: 80
-        path: /{{ .Values.branch }}/maven-repo/inttests
+        path: /{{ .Values.branch }}/maven-repo/{{ .Values.ingressPathSuffix }}
         pathType: Prefix
\ No newline at end of file
diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml
index 6e53680d..2c5ab2eb 100644
--- a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml
+++ b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml
@@ -7,4 +7,5 @@
 namespace: galasa-development
 branch: main
 imageName: ghcr.io/galasa-dev/inttests-maven-artefacts
-imageTag: main
\ No newline at end of file
+imageTag: main
+ingressPathSuffix: inttests
diff --git a/pipelines/tasks/gradle-build.yaml b/pipelines/tasks/gradle-build.yaml
index 29e9349d..4767f44f 100644
--- a/pipelines/tasks/gradle-build.yaml
+++ b/pipelines/tasks/gradle-build.yaml
@@ -20,10 +20,13 @@ spec:
     type: array   
   - name: command
     type: array
+  - name: image
+    type: string
+    default: harbor.galasa.dev/docker_proxy_cache/library/gradle:8.9-jdk17
   steps:
   - name: gradle-build
     workingDir: /workspace/git/$(params.context)
-    image: harbor.galasa.dev/docker_proxy_cache/library/gradle:8.9-jdk17
+    image: $(params.image)
     imagePullPolicy: IfNotPresent
     env:
     - name: ORG_GRADLE_PROJECT_signingKeyId