From 7341e25591452b6340e4008bf5adbd2827ff785b Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Sat, 21 Feb 2026 17:37:17 +0800 Subject: [PATCH 1/2] Upgrade infra-e2e to fix Docker 29 containerd compatibility Upgrade skywalking-infra-e2e to 8c21e43 which disables containerd image store and negotiates Docker API version internally, fixing E2E test failures on GitHub Actions runners with Docker 29. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/skywalking.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 0a3813dcc39c..4f60edcbd3f8 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -811,7 +811,7 @@ jobs: if: matrix.test.docker != null run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde + uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} @@ -891,7 +891,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde + uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -968,7 +968,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde + uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -1047,7 +1047,7 @@ jobs: shell: bash run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package - name: Java version ${{ matrix.java-version }} - uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde + uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4 env: SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} with: @@ -1143,7 +1143,7 @@ jobs: # fi # docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v # - name: ${{ matrix.test.name }} -# uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde +# uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4 # with: # e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} # - if: ${{ failure() }} From 8845a56440ef4ff96e4f8024bd76bce6eefe9fb7 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Sat, 21 Feb 2026 17:40:52 +0800 Subject: [PATCH 2/2] Revert "Fix CI E2E failures caused by Docker 29 on GitHub Actions runners (#13706)" This reverts commit 88ca64875914613014cb0e99845d7a02b874a680. --- .github/workflows/skywalking.yaml | 80 ------------------------------- 1 file changed, 80 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 4f60edcbd3f8..d763ef2584d7 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -204,22 +204,6 @@ jobs: with: submodules: true persist-credentials: false - - name: Disable containerd image store - shell: bash - run: | - DAEMON_JSON="/etc/docker/daemon.json" - if [ -f "$DAEMON_JSON" ]; then - sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \ - | sudo tee "${DAEMON_JSON}.tmp" > /dev/null - sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON" - else - echo '{"features": {"containerd-snapshotter": false}}' \ - | sudo tee "$DAEMON_JSON" > /dev/null - fi - sudo systemctl restart docker - docker version - docker info - echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - uses: actions/download-artifact@v4 name: Download distribution tar with: @@ -755,22 +739,6 @@ jobs: with: submodules: true persist-credentials: false - - name: Disable containerd image store - shell: bash - run: | - DAEMON_JSON="/etc/docker/daemon.json" - if [ -f "$DAEMON_JSON" ]; then - sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \ - | sudo tee "${DAEMON_JSON}.tmp" > /dev/null - sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON" - else - echo '{"features": {"containerd-snapshotter": false}}' \ - | sudo tee "$DAEMON_JSON" > /dev/null - fi - sudo systemctl restart docker - docker version - docker info - echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -855,22 +823,6 @@ jobs: with: submodules: true persist-credentials: false - - name: Disable containerd image store - shell: bash - run: | - DAEMON_JSON="/etc/docker/daemon.json" - if [ -f "$DAEMON_JSON" ]; then - sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \ - | sudo tee "${DAEMON_JSON}.tmp" > /dev/null - sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON" - else - echo '{"features": {"containerd-snapshotter": false}}' \ - | sudo tee "$DAEMON_JSON" > /dev/null - fi - sudo systemctl restart docker - docker version - docker info - echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -932,22 +884,6 @@ jobs: with: submodules: true persist-credentials: false - - name: Disable containerd image store - shell: bash - run: | - DAEMON_JSON="/etc/docker/daemon.json" - if [ -f "$DAEMON_JSON" ]; then - sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \ - | sudo tee "${DAEMON_JSON}.tmp" > /dev/null - sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON" - else - echo '{"features": {"containerd-snapshotter": false}}' \ - | sudo tee "$DAEMON_JSON" > /dev/null - fi - sudo systemctl restart docker - docker version - docker info - echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -1004,22 +940,6 @@ jobs: with: submodules: true persist-credentials: false - - name: Disable containerd image store - shell: bash - run: | - DAEMON_JSON="/etc/docker/daemon.json" - if [ -f "$DAEMON_JSON" ]; then - sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \ - | sudo tee "${DAEMON_JSON}.tmp" > /dev/null - sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON" - else - echo '{"features": {"containerd-snapshotter": false}}' \ - | sudo tee "$DAEMON_JSON" > /dev/null - fi - sudo systemctl restart docker - docker version - docker info - echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: