From 1007061537aad32eec899afbd8a912b99768e23e Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 19 Feb 2025 14:52:32 +0100 Subject: [PATCH] Revert to jammy base when running system tests These tests need a shell, which is not available in the noble tiny image. There are no non-tiny images for noble available yet. See gh-42711 --- .../image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle | 2 +- .../image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle index 8baad686e0d..cff073d3b05 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle @@ -39,6 +39,6 @@ application { bootBuildImage { archiveFile = bootDistZip.archiveFile - builder = "paketobuildpacks/builder-noble-java-tiny:latest" + builder = "paketobuildpacks/builder-jammy-base:latest" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()] } diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle index 081683d4d1b..51e4cbc9fb7 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle @@ -39,6 +39,6 @@ application { bootBuildImage { archiveFile = distZip.archiveFile - builder = "paketobuildpacks/builder-noble-java-tiny:latest" + builder = "paketobuildpacks/builder-jammy-base:latest" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()] }