Merge pull request #24 from rnc/TOOLING

Remove references to configure konflux-tooling image. Update pipeline…
project-ncl · Feb 13, 2025 · 148af5b · 148af5b
2 parents e43902e + 2b1f553
commit 148af5b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java b/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java
@@ -102,7 +102,6 @@ public BuildResponse create(BuildRequest buildRequest) {
         templateProperties.put("MVN_REPO_DEPLOY_URL", buildRequest.getRepositoryDeployUrl());
         templateProperties.put("QUAY_REPO", config.quayRepo());
         templateProperties.put("RECIPE_IMAGE", buildRequest.getRecipeImage());
-        templateProperties.put("PNC_KONFLUX_TOOLING_IMAGE", config.toolingImage());
         templateProperties.put("REVISION", buildRequest.getScmRevision());
         templateProperties.put("URL", buildRequest.getScmUrl());
         templateProperties.put("caTrustConfigMapName", "custom-ca");

diff --git a/src/main/java/org/jboss/pnc/konfluxbuilddriver/util/Configuration.java b/src/main/java/org/jboss/pnc/konfluxbuilddriver/util/Configuration.java
@@ -8,9 +8,6 @@
 @ConfigMapping(prefix = "konflux-build-driver")
 public interface Configuration {
 
-    @WithName("pnc-konflux-tooling")
-    String toolingImage();
-
     String quayRepo();
 
     @WithName("pipeline-resolver")

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -1,8 +1,6 @@
 konflux-build-driver:
   quay-repo: "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux"
-  pnc-konflux-tooling: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest"
-  # TODO: This will eventually be build-definitions repository
-  pipeline-resolver: "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/pipeline/mw-pipeline-v0.1.yaml"
+  pipeline-resolver: "https://raw.githubusercontent.com/project-ncl/konflux-integration/refs/heads/main/pipeline/mw-pipeline-v0.1.yaml"
   domain-proxy-allow-list: "localhost,cdn-ubi.redhat.com,repo1.maven.org,repo.scala-sbt.org,scala.jfrog.io,repo.typesafe.com,jfrog-prod-usw2-shared-oregon-main.s3.amazonaws.com"
   domain-proxy-internal-non-proxy-hosts: "localhost"
   indy-proxy-enabled: false

diff --git a/src/test/java/org/jboss/pnc/konfluxbuilddriver/UtilTest.java b/src/test/java/org/jboss/pnc/konfluxbuilddriver/UtilTest.java
@@ -18,6 +18,6 @@ public class UtilTest {
     @Test
     public void testMapping() {
         assertEquals("quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux", configTest.quayRepo());
-        assertEquals("foobar", configTest.toolingImage());
+        assertEquals("foobar", configTest.resolverTarget());
     }
 }
diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml
@@ -8,4 +8,4 @@ quarkus:
       "org.jboss.pnc.konfluxbuilddriver":
         level: DEBUG
 konflux-build-driver:
-  pnc-konflux-tooling: "foobar"
+  pipeline-resolver: "foobar"