This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch fix/disable-containerd-image-store in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit e6b2f59065b3651e1946eceabdd688ced314ef93 Author: Wu Sheng <[email protected]> AuthorDate: Sat Feb 21 08:25:16 2026 +0800 Upgrade infra e2e and disable containerd image store in CI Upgrade skywalking-infra-e2e to the branch that migrates deprecated APIs. Disable containerd image store on GitHub Actions runners to fix E2E test failures caused by compatibility issues with older Docker images. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .github/workflows/skywalking.yaml | 75 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 695b18f50b..4e87bddf4f 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -204,6 +204,19 @@ 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 - uses: actions/download-artifact@v4 name: Download distribution tar with: @@ -739,6 +752,19 @@ 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 - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -779,7 +805,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@upgrade-deps-and-migrate-deprecated-apis with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} @@ -823,6 +849,19 @@ 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 - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -843,7 +882,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@upgrade-deps-and-migrate-deprecated-apis env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -884,6 +923,19 @@ 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 - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -904,7 +956,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@upgrade-deps-and-migrate-deprecated-apis env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -940,6 +992,19 @@ 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 - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV" - uses: apache/skywalking-cli/actions/setup@master with: @@ -967,7 +1032,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@upgrade-deps-and-migrate-deprecated-apis env: SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} with: @@ -1063,7 +1128,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@upgrade-deps-and-migrate-deprecated-apis # with: # e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} # - if: ${{ failure() }}
