From e7f8b22479940b34430142a9a948f775a38213e9 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 11 Mar 2025 13:32:15 +0100 Subject: [PATCH] Enable platform mismatch test again We now try to pull linux/arm64. The image only exists for linux/amd64, which should throw the platform mismatch exception. See gh-44059 --- .../gradle/tasks/bundling/BootBuildImageIntegrationTests.java | 4 +--- ...ImageIntegrationTests-failsWithIncompatiblePlatform.gradle | 2 +- 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 85a5ab1bb94..cad3e53ba22 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 @@ -36,7 +36,6 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.commons.compress.utils.IOUtils; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.TaskOutcome; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -515,12 +514,11 @@ class BootBuildImageIntegrationTests { } @TestTemplate - @Disabled("Docker is behaving differently on various systems") void failsWithIncompatiblePlatform() throws IOException { 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.3-amd64'. Requested platform 'invalid/platform' but got 'linux/amd64'"); + "Image platform mismatch detected. The configured platform 'linux/arm64' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64'. Requested platform 'linux/arm64' 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 09c0129dff2..e5b41bf85e6 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 @@ -5,5 +5,5 @@ plugins { bootBuildImage { builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64" - imagePlatform = "invalid/platform" + imagePlatform = "linux/arm64" }