From 8317a45f510ab2ff391e9c9e8eadbc9d58eb2d3f Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Thu, 19 Dec 2024 13:35:41 +0000 Subject: [PATCH 1/2] Switch to use konflux-jbs-pnc-tenant/konflux-tooling image --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 72abf12..d05867d 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,6 +1,6 @@ konflux-build-driver: quay-repo: "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux" - konflux-processor: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest" + konflux-processor: "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" indy-proxy-enabled: false From 9f410c71b61590246048e036999f0c0e65a31906 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Thu, 9 Jan 2025 10:52:12 +0000 Subject: [PATCH 2/2] Rename konflux-processor to pnc-konflux-tooling --- src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java | 2 +- .../org/jboss/pnc/konfluxbuilddriver/util/Configuration.java | 4 ++-- src/main/resources/application.yaml | 2 +- src/test/java/org/jboss/pnc/konfluxbuilddriver/UtilTest.java | 2 +- src/test/resources/application.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java b/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java index 9bae08a..4cd8679 100644 --- a/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java +++ b/src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java @@ -100,7 +100,7 @@ public BuildResponse create(BuildRequest buildRequest) { templateProperties.put("MVN_REPO_DEPLOY_URL", buildRequest.repositoryDeployUrl()); templateProperties.put("QUAY_REPO", config.quayRepo()); templateProperties.put("RECIPE_IMAGE", buildRequest.recipeImage()); - templateProperties.put("JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE", config.processor()); + templateProperties.put("JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE", config.toolingImage()); templateProperties.put("REVISION", buildRequest.scmRevision()); templateProperties.put("URL", buildRequest.scmUrl()); 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 index 6c4e4e7..15c2dc5 100644 --- a/src/main/java/org/jboss/pnc/konfluxbuilddriver/util/Configuration.java +++ b/src/main/java/org/jboss/pnc/konfluxbuilddriver/util/Configuration.java @@ -6,8 +6,8 @@ @ConfigMapping(prefix = "konflux-build-driver") public interface Configuration { - @WithName("konflux-processor") - String processor(); + @WithName("pnc-konflux-tooling") + String toolingImage(); String quayRepo(); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d05867d..85988c9 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,6 +1,6 @@ konflux-build-driver: quay-repo: "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc-konflux" - konflux-processor: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/konflux-tooling:latest" + 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" 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 index b04450f..6f5460b 100644 --- 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.processor()); + assertEquals("foobar", configTest.toolingImage()); } } diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml index edf002a..77df06c 100644 --- 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: - konflux-processor: "foobar" + pnc-konflux-tooling: "foobar"