From 1f1a88cf7b2db7c9f4b78347d6e55c3be4686184 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Feb 2026 16:22:34 -0800 Subject: [PATCH 1/2] Revert "Temporarily update system tests to use specific platform" This reverts commit 1bb9dc3649189f9a1b23c88b196b50af9601ec6c. --- .../image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle | 1 - .../boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle | 1 - 2 files changed, 2 deletions(-) diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle index 1345acd7719..2c7b83e6ae2 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle +++ b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle @@ -56,6 +56,5 @@ application { bootBuildImage { archiveFile = distZip.archiveFile runImage = "paketobuildpacks/ubuntu-noble-run:latest" - imagePlatform = "linux/amd64" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()] } diff --git a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle index 406927e3712..0adff84e4f7 100644 --- a/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle +++ b/system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle @@ -48,7 +48,6 @@ war { bootBuildImage { archiveFile = war.archiveFile runImage = "paketobuildpacks/ubuntu-noble-run:latest" - imagePlatform = "linux/amd64" environment = [ 'BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '11.*', From 5ba88c69bba7dfa0941000a0a0fdea0ff9d58ff5 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Feb 2026 17:07:21 -0800 Subject: [PATCH 2/2] Temporarily disable containerd snapshotter See gh-49251 --- .github/workflows/run-system-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml index b89c3891439..63801afd2b3 100644 --- a/.github/workflows/run-system-tests.yml +++ b/.github/workflows/run-system-tests.yml @@ -18,6 +18,10 @@ jobs: - version: 21 toolchain: true steps: + - name: Setup Docker and Disable containerd-snapshotter) + uses: docker/setup-docker-action@e43656e248c0bd0647d3f5c195d116aacf6fcaf4 # v4.7.0 + with: + daemon-config: '{"features":{"containerd-snapshotter":false}}' - name: Check Out Code uses: actions/checkout@v6 - name: Prepare Gradle Build