Add quay repo

Author: rnc

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

@@ -4,6 +4,8 @@ metadata:
   name: mw-pipeline
 spec:
   params:
+    - name: QUAY_REPO
+      type: string
     - name: URL
       description: Repository URL to clone from
       type: string
@@ -73,8 +75,7 @@ spec:
         - git-clone
       params:
         - name: IMAGE_URL
-          # value: 'quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux-trusted-source:{{revision}}'
-          value: 'quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc:trusted-source-$(context.pipelineRun.name)'
+          value: $(params.QUAY_REPO):trusted-source-$(context.pipelineRun.name)
         - name: NAME
           value: $(context.pipelineRun.name)
         - name: RECIPE_IMAGE
@@ -110,7 +111,7 @@ spec:
         - name: HERMETIC
           value: "false"
         - name: IMAGE # output image
-          value: quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc:build-$(context.pipelineRun.name)
+          value: $(params.QUAY_REPO):build-$(context.pipelineRun.name)
         - name: DOCKERFILE # local path to the containerfile
           value: .jbs/Containerfile
         - name: caTrustConfigMapName

deploy/tasks/maven-deployment.yaml

@@ -29,6 +29,7 @@ spec:
     - name: MVN_PASSWORD
       description: Name of the secret holding the Maven repository password
       type: string
+      # https://github.com/tektoncd/pipeline/issues/8249
       default: ""
     - name: MVN_SERVER_ID
       description: Server identification in Maven settings.

deploy/tasks/pre-build.yaml

@@ -80,6 +80,7 @@ spec:
           cpu: 10m
           memory: 512Mi
       script: |
+        ls -lR $(workspaces.source.path)
         /opt/jboss/container/java/run/run-java.sh $(params.BUILD_TOOL)-prepare --java-version=$(params.JAVA_VERSION) --build-tool-version=$(params.BUILD_TOOL_VERSION) --recipe-image=$(params.RECIPE_IMAGE) --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE) --disabled-plugins=$(params.BUILD_PLUGINS) $(workspaces.source.path)/source
       env:
         - name: BUILD_SCRIPT
@@ -117,6 +118,7 @@ spec:
     - name: create-pre-build-image
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:52f1391e6f1c472fd10bb838f64fae2ed3320c636f536014978a5ddbdfc6b3af
       script: |
+        ls -lR $(workspaces.source.path)
         echo "Creating pre-build-image archive"
         create-archive --store $(params.IMAGE_URL) $(results.PRE_BUILD_IMAGE_DIGEST.path)=$(workspaces.source.path)/source
       env:

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

@@ -21,11 +21,14 @@ public class Pipeline extends Base implements Runnable {
     @Inject
     Driver driver;
 
+    @CommandLine.Option(names = "-q", description = "Quay repo", defaultValue = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc")
+    String quayRepo;
+
     @ActivateRequestContext // https://github.com/quarkusio/quarkus/issues/8758
     @Override
     public void run() {
         logger.info("### in here with driver {}", driver);
-        driver.addAccessToken(accessToken.orElse("NO_TOKEN"));
+        driver.addValues(accessToken.orElse("NO_TOKEN"), quayRepo);
 
         BuildRequest request = BuildRequest.builder()
                 .namespace(namespace)

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

@@ -46,10 +46,11 @@ public class Driver {
     ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
 
     private String accessToken;
+    private String quayRepo;
 
-    public void addAccessToken(String accessToken) {
-        System.err.println("### oidc " + oidcClient);
+    public void addValues(String accessToken, String quayRepo) {
         this.accessToken = accessToken;
+        this.quayRepo = quayRepo;
     }
 
     public void create(BuildRequest buildRequest) throws IOException {
@@ -62,6 +63,7 @@ public void create(BuildRequest buildRequest) throws IOException {
         }
 
         Map<String, String> templateProperties = new HashMap<>();
+        templateProperties.put("QUAY_REPO", quayRepo);
         templateProperties.put("URL", buildRequest.getScmUrl());
         templateProperties.put("REVISION", buildRequest.getScmRevision());
         templateProperties.put("BUILD_TOOL", buildRequest.getBuildTool());

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

@@ -26,6 +26,8 @@ spec:
               storage: 1Gi
         status: {}
   params:
+    - name: QUAY_REPO
+      value: "%{QUAY_REPO}"
     - name: URL
       value: "%{URL}"
     - name: REVISION