From 24854f469cdc048f7fa128a8a1a2cb7c5f1d39c0 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 10 Mar 2025 11:00:55 +0100 Subject: [PATCH] Use single-arch image to test platform mismatch detection See gh-44059 --- .../gradle/tasks/bundling/BootBuildImageIntegrationTests.java | 2 +- ...ImageIntegrationTests-failsWithIncompatiblePlatform.gradle | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java index 6b8001dd50..db306d4cfe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java @@ -518,7 +518,7 @@ class BootBuildImageIntegrationTests { writeMainClass(); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage"); assertThat(result.getOutput()).contains( - "Image platform mismatch detected. The configured platform 'invalid/platform' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1'. Requested platform 'invalid/platform' but got 'linux/amd64'"); + "Image platform mismatch detected. The configured platform 'invalid/platform' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64'. Requested platform 'invalid/platform' but got 'linux/amd64'"); } private void writeMainClass() throws IOException { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle index ab3a25f1bd..09c0129dff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle @@ -4,8 +4,6 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" - runImage = "paketobuildpacks/run-jammy-tiny" - buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"] + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64" imagePlatform = "invalid/platform" }