From 0fb220248dc028a29a1d18cb125f3849e356056f Mon Sep 17 00:00:00 2001 From: Andrea Vibelli Date: Thu, 5 Sep 2024 10:23:41 +0200 Subject: [PATCH 1/2] Update to the latest jvm-build-service-builder-images --- deploy/operator/config/kustomization.yaml | 2 +- deploy/operator/config/system-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/operator/config/kustomization.yaml b/deploy/operator/config/kustomization.yaml index a840faf66..b695b19f6 100644 --- a/deploy/operator/config/kustomization.yaml +++ b/deploy/operator/config/kustomization.yaml @@ -11,4 +11,4 @@ labels: #note that when updating the ref here you must also update system-config.yaml patches: -- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/026b26ba92b1d56ffcd172e7785e679437fcff70/image-config.yaml +- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/dc2bb99227bfe251a8273923a4e05ca01652e256/image-config.yaml diff --git a/deploy/operator/config/system-config.yaml b/deploy/operator/config/system-config.yaml index 2d2dc876e..26d28bc48 100644 --- a/deploy/operator/config/system-config.yaml +++ b/deploy/operator/config/system-config.yaml @@ -7,9 +7,9 @@ spec: builders: #note that when updating the ref here you must also update kustomization.yaml ubi8: - image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:026b26ba92b1d56ffcd172e7785e679437fcff70 + image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:dc2bb99227bfe251a8273923a4e05ca01652e256 priority: 2000 ubi7: - image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:026b26ba92b1d56ffcd172e7785e679437fcff70 + image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:dc2bb99227bfe251a8273923a4e05ca01652e256 priority: 1000 From 5425e189e2006a5b95fd3c396b6eca262e30b1e7 Mon Sep 17 00:00:00 2001 From: Andrea Vibelli Date: Fri, 6 Sep 2024 11:49:45 +0200 Subject: [PATCH 2/2] Update builder images and fix leftovers for Ant update to 1.10.15 --- deploy/operator/config/kustomization.yaml | 2 +- deploy/operator/config/system-config.yaml | 4 ++-- .../redhat/hacbs/container/analyser/build/ant/AntUtils.java | 2 +- .../container/analyser/build/LookupBuildInfoCommandTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/operator/config/kustomization.yaml b/deploy/operator/config/kustomization.yaml index b695b19f6..9f39c54ba 100644 --- a/deploy/operator/config/kustomization.yaml +++ b/deploy/operator/config/kustomization.yaml @@ -11,4 +11,4 @@ labels: #note that when updating the ref here you must also update system-config.yaml patches: -- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/dc2bb99227bfe251a8273923a4e05ca01652e256/image-config.yaml +- path: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service-builder-images/67236e7041a57cd8e31a6f890b0155bc0a1c1700/image-config.yaml diff --git a/deploy/operator/config/system-config.yaml b/deploy/operator/config/system-config.yaml index 26d28bc48..5130c92a7 100644 --- a/deploy/operator/config/system-config.yaml +++ b/deploy/operator/config/system-config.yaml @@ -7,9 +7,9 @@ spec: builders: #note that when updating the ref here you must also update kustomization.yaml ubi8: - image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:dc2bb99227bfe251a8273923a4e05ca01652e256 + image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi8:67236e7041a57cd8e31a6f890b0155bc0a1c1700 priority: 2000 ubi7: - image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:dc2bb99227bfe251a8273923a4e05ca01652e256 + image: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service-builder-images/ubi7:67236e7041a57cd8e31a6f890b0155bc0a1c1700 priority: 1000 diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java index edf00abab..660126830 100644 --- a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java +++ b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/build/ant/AntUtils.java @@ -22,7 +22,7 @@ public final class AntUtils { public static final String ANT_VERSION_JAVA5 = "1.9.16"; - public static final String ANT_VERSION_JAVA8 = "1.10.13"; + public static final String ANT_VERSION_JAVA8 = "1.10.15"; public static final String BUILD_XML = DEFAULT_BUILD_FILENAME; diff --git a/java-components/build-request-processor/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java b/java-components/build-request-processor/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java index d54882ea3..6f5b62d93 100644 --- a/java-components/build-request-processor/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java +++ b/java-components/build-request-processor/src/test/java/com/redhat/hacbs/container/analyser/build/LookupBuildInfoCommandTest.java @@ -34,7 +34,7 @@ @QuarkusTest @QuarkusTestResource(value = LogCollectingTestResource.class, restrictToAnnotatedClass = true, initArgs = @ResourceArg(name = LogCollectingTestResource.LEVEL, value = "FINE")) class LookupBuildInfoCommandTest { - private static final String TOOL_VERSIONS = "sbt:1.8.0,jdk:7;8;11;17;21,maven:3.8.8;3.9.5,ant:1.9.16;1.10.13,gradle:8.4;8.3;8.0.2;7.4.2;7.6.3;7.5.1;6.9.2;5.6.4;4.10.3"; + private static final String TOOL_VERSIONS = "sbt:1.8.0,jdk:7;8;11;17;21,maven:3.8.8;3.9.5,ant:1.9.16;1.10.15,gradle:8.4;8.3;8.0.2;7.4.2;7.6.3;7.5.1;6.9.2;5.6.4;4.10.3"; private static final String CACHE_URL = "https://repo1.maven.org/maven2";