This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b39805b206 Upgrade infra-e2e to fix Docker 29 containerd compatibility
(#13708)
b39805b206 is described below
commit b39805b206b1dede4f7f358c0158cd55457184cd
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Sat Feb 21 18:23:58 2026 +0800
Upgrade infra-e2e to fix Docker 29 containerd compatibility (#13708)
---
.github/workflows/skywalking.yaml | 90 +++------------------------------------
1 file changed, 5 insertions(+), 85 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 0a3813dcc3..d763ef2584 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:
@@ -811,7 +779,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() }}
@@ -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:
@@ -891,7 +843,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 }}
@@ -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:
@@ -968,7 +904,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 }}
@@ -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:
@@ -1047,7 +967,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 +1063,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() }}
