Merge branch 'main' into domain-proxy

Author: tecarter94

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

@@ -101,7 +101,7 @@ spec:
         resolver: http
         params:
           - name: url
-            value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/NCL8774/deploy/tasks/pre-build.yaml
+            value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/pre-build.yaml
       workspaces:
         - name: source
           workspace: source
@@ -140,7 +140,7 @@ spec:
         resolver: http
         params:
           - name: url
-            value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/NCL8774/deploy/tasks/buildah-oci-ta.yaml
+            value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/buildah-oci-ta.yaml
 
     - name: maven-deployment
       runAfter:
@@ -160,4 +160,4 @@ spec:
         resolver: http
         params:
           - name: url
-            value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/NCL8774/deploy/tasks/maven-deployment.yaml
+            value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/maven-deployment.yaml

java-components/cli/pom.xml

@@ -24,12 +24,6 @@
             <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
             <artifactId>hacbs-resource-model</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-            <artifactId>driver</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli-shell-jline2</artifactId>
@@ -70,6 +64,10 @@
             <groupId>com.google.cloud.tools</groupId>
             <artifactId>jib-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.pnc</groupId>
+            <artifactId>konflux-build-driver</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
@@ -115,6 +113,7 @@
             <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

@@ -34,9 +34,6 @@ 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/CancelPipeline.java

@@ -3,12 +3,11 @@
 import jakarta.enterprise.context.control.ActivateRequestContext;
 import jakarta.inject.Inject;
 
+import org.jboss.pnc.konfluxbuilddriver.Driver;
+import org.jboss.pnc.konfluxbuilddriver.dto.CancelRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.redhat.hacbs.driver.Driver;
-import com.redhat.hacbs.driver.dto.CancelRequest;
-
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "cancel-pipeline", mixinStandardHelpOptions = true, description = "Creates a pipeline")

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

@@ -3,13 +3,12 @@
 import jakarta.enterprise.context.control.ActivateRequestContext;
 import jakarta.inject.Inject;
 
+import org.jboss.pnc.konfluxbuilddriver.Driver;
+import org.jboss.pnc.konfluxbuilddriver.dto.BuildRequest;
+import org.jboss.pnc.konfluxbuilddriver.dto.BuildResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.redhat.hacbs.driver.Driver;
-import com.redhat.hacbs.driver.dto.BuildRequest;
-import com.redhat.hacbs.driver.dto.BuildResponse;
-
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "create-pipeline", mixinStandardHelpOptions = true, description = "Creates a pipeline")
@@ -20,18 +19,26 @@ public class CreatePipeline extends Base implements Runnable {
     @Inject
     Driver driver;
 
-    @CommandLine.Option(names = "--quay", description = "Quay repo", defaultValue = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux")
-    String quayRepo;
+    @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;
 
-    @CommandLine.Option(names = "--processor", description = "Request Process Image", defaultValue = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest")
-    String processor;
+    // Not possible to set Quarkus configuration via CLI due to
+    // https://github.com/quarkusio/quarkus/issues/19128
+    // Therefore create an application.properties file in the directory where the CLI is run
+    // and configure the values there manually.
+    //
+    //    @CommandLine.Option(names = "--quay", description = "Quay repo", defaultValue = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux")
+    //    String quayRepo;
+    //
+    //    @CommandLine.Option(names = "--processor", description = "Request Process Image", defaultValue = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest")
+    //    String processor;
 
     @ActivateRequestContext // https://github.com/quarkusio/quarkus/issues/8758
     @Override
     public void run() {
-        driver.setQuayRepo(quayRepo);
-        driver.setProcessor(processor);
-        driver.setAccessToken(accessToken.orElse(""));
+        //        driver.setQuayRepo(quayRepo);
+        //        driver.setProcessor(processor);
+        //        driver.setAccessToken(accessToken.orElse(""));
 
         BuildRequest request = BuildRequest.builder()
                 .namespace(namespace)