Set recipeImage

Author: rnc

deploy/pipeline/mw-pipeline-v0.1.yaml

@@ -18,6 +18,8 @@ spec:
       type: string
       default: |
         date
+    - name: RECIPE_IMAGE
+      type: string
     - name: BUILD_TOOL
       type: string
     - name: BUILD_TOOL_VERSION
@@ -56,9 +58,6 @@ spec:
           value: $(params.REVISION)
         - name: verbose
           value: 'true'
-        # TODO: Unclear why this was added ; causes knock-on effects that the directory layout is then wrong.
-        # - name: subdirectory
-        #   value: ''
       taskRef:
         resolver: bundles
         params:
@@ -84,7 +83,7 @@ spec:
         - name: NAME
           value: $(context.pipelineRun.name)
         - name: RECIPE_IMAGE
-          value: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:latest"
+          value: $(params.RECIPE_IMAGE)
         - name: BUILD_TOOL
           value: $(params.BUILD_TOOL)
         - name: BUILD_TOOL_VERSION

java-components/cli/src/main/java/com/redhat/hacbs/cli/driver/Base.java

@@ -34,6 +34,9 @@ public abstract class Base {
     @CommandLine.Option(names = "--dependencies", description = "Dependencies URL", required = true)
     String dependencies;
 
+    @CommandLine.Option(names = "-i", description = "Recipe Image", defaultValue = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:latest")
+    String recipeImage;
+
     @ConfigProperty(name = "access.token")
     Optional<String> accessToken;
 

java-components/cli/src/main/java/com/redhat/hacbs/cli/driver/Pipeline.java

@@ -41,6 +41,7 @@ public void run() {
                 .repositoryDeployUrl(deploy)
                 .repositoryDependencyUrl(dependencies)
                 .repositoryBuildContentId("test-maven-konflux-int-0001")
+                .recipeImage(recipeImage)
                 .build();
         try {
             driver.create(request);

java-components/driver/src/main/java/com/redhat/hacbs/driver/Driver.java

@@ -66,6 +66,7 @@ public void create(BuildRequest buildRequest) throws IOException {
         templateProperties.put("QUAY_REPO", quayRepo);
         templateProperties.put("URL", buildRequest.getScmUrl());
         templateProperties.put("REVISION", buildRequest.getScmRevision());
+        templateProperties.put("RECIPE_IMAGE", buildRequest.getRecipeImage());
         templateProperties.put("BUILD_TOOL", buildRequest.getBuildTool());
         templateProperties.put("BUILD_TOOL_VERSION", buildRequest.getBuildToolVersion());
         templateProperties.put("JAVA_VERSION", buildRequest.getJavaVersion());

java-components/driver/src/main/java/com/redhat/hacbs/driver/dto/BuildRequest.java

@@ -14,6 +14,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BuildRequest {
 
+    private final String recipeImage;
     private final String buildTool;
     private final String buildToolVersion;
     private final String javaVersion;

java-components/driver/src/main/resources/pipeline.yaml

@@ -33,6 +33,8 @@ spec:
       value: "%{URL}"
     - name: REVISION
       value: "%{REVISION}"
+    - name: RECIPE_IMAGE
+      value: "%{RECIPE_IMAGE}"
     - name: BUILD_TOOL
       value: "%{BUILD_TOOL}"
     - name: BUILD_TOOL_VERSION