Skip to content

Commit e7f8b22

Browse files
committed
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
1 parent 8fca1db commit e7f8b22

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.commons.compress.utils.IOUtils;
3737
import org.gradle.testkit.runner.BuildResult;
3838
import org.gradle.testkit.runner.TaskOutcome;
39-
import org.junit.jupiter.api.Disabled;
4039
import org.junit.jupiter.api.TestTemplate;
4140
import org.junit.jupiter.api.condition.EnabledOnOs;
4241
import org.junit.jupiter.api.condition.OS;
@@ -515,12 +514,11 @@ void failsWhenCachesAreConfiguredTwice() throws IOException {
515514
}
516515

517516
@TestTemplate
518-
@Disabled("Docker is behaving differently on various systems")
519517
void failsWithIncompatiblePlatform() throws IOException {
520518
writeMainClass();
521519
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
522520
assertThat(result.getOutput()).contains(
523-
"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'");
521+
"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'");
524522
}
525523

526524
private void writeMainClass() throws IOException {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ plugins {
55

66
bootBuildImage {
77
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64"
8-
imagePlatform = "invalid/platform"
8+
imagePlatform = "linux/arm64"
99
}

0 commit comments

Comments
 (0)