Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to use konflux-jbs-pnc-tenant/konflux-tooling image #8

Merged
merged 2 commits into from
Jan 13, 2025
Merged

Switch to use konflux-jbs-pnc-tenant/konflux-tooling image #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8317a45
Switch to use konflux-jbs-pnc-tenant/konflux-tooling image
rnc Dec 19, 2024
9f410c7
Rename konflux-processor to pnc-konflux-tooling
rnc Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/pnc/konfluxbuilddriver/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jboss/pnc/konfluxbuilddriver/util/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
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
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jboss/pnc/konfluxbuilddriver/UtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
2 changes: 1 addition & 1 deletion src/test/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ quarkus:
"org.jboss.pnc.konfluxbuilddriver":
level: DEBUG
konflux-build-driver:
konflux-processor: "foobar"
pnc-konflux-tooling: "foobar"
Loading