From 4a02282607ad663adcb668abd14cbd33fca2ea90 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Mon, 17 Aug 2026 22:12:31 +0000 Subject: [PATCH 1/3] ci: do not install python tools for test Signed-off-by: Samuel K --- .../docker-features-forward-reference/.devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/tests/up-features/testdata/docker-features-forward-reference/.devcontainer.json b/e2e/tests/up-features/testdata/docker-features-forward-reference/.devcontainer.json index 245b6dcd3d..4793e9c3db 100644 --- a/e2e/tests/up-features/testdata/docker-features-forward-reference/.devcontainer.json +++ b/e2e/tests/up-features/testdata/docker-features-forward-reference/.devcontainer.json @@ -2,7 +2,8 @@ "image": "ghcr.io/devsy-org/test-images/base:ubuntu", "features": { "ghcr.io/devcontainers/features/python:1": { - "version": "3.11" + "version": "3.13", + "installTools": false }, "./features/test-feature": {} } From 01d41cfd77e5915b768ceb9c130c64d6bcb4eefe Mon Sep 17 00:00:00 2001 From: Samuel K Date: Mon, 17 Aug 2026 23:31:42 +0000 Subject: [PATCH 2/3] fix: use correct version for comparison Signed-off-by: Samuel K --- e2e/tests/up-features/up_features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/up-features/up_features.go b/e2e/tests/up-features/up_features.go index 1a4357a2c2..8edac45167 100644 --- a/e2e/tests/up-features/up_features.go +++ b/e2e/tests/up-features/up_features.go @@ -502,7 +502,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( out, err := f.DevsySSH(ctx, wsName, "python3 --version") framework.ExpectNoError(err) - gomega.Expect(out).To(gomega.ContainSubstring("Python 3.11")) + gomega.Expect(out).To(gomega.ContainSubstring("Python 3.13.15")) }, ginkgo.SpecTimeout(framework.TimeoutLong()), ) From 97ecfe6b5360910ce7e87765051aa5a9e90354da Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 18 Aug 2026 00:10:22 +0000 Subject: [PATCH 3/3] ci: retry flaky provider/tunnel e2e jobs on cold image pulls Both jobs fail intermittently pulling never-cached images (mcr.microsoft.com/devcontainers/go, ghcr.io/devsy-org/test-images) on fresh GH-hosted runners. Matches the existing flake-attempts:2 mitigation already used by the up-provider-podman-* jobs for the same cold-pull network flakiness. Signed-off-by: Samuel K --- .github/workflows/pr-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index ac4100f924..4c6113d50c 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -254,6 +254,7 @@ jobs: free-disk-space: false install-kind: false requires-secret: false + flake-attempts: 2 - label: mcp runner: ubuntu-latest @@ -266,6 +267,7 @@ jobs: free-disk-space: true install-kind: true requires-secret: false + flake-attempts: 2 - label: ssh runner: ubuntu-latest