Skip to content

Commit b39805b

Browse files
wu-shengwu-sheng
authored
Upgrade infra-e2e to fix Docker 29 containerd compatibility (#13708)
1 parent 88ca648 commit b39805b

File tree

1 file changed

+5
-85
lines changed

1 file changed

+5
-85
lines changed

‎.github/workflows/skywalking.yaml‎

Lines changed: 5 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -204,22 +204,6 @@ jobs:
204204
with:
205205
submodules: true
206206
persist-credentials: false
207-
- name: Disable containerd image store
208-
shell: bash
209-
run: |
210-
DAEMON_JSON="/etc/docker/daemon.json"
211-
if [ -f "$DAEMON_JSON" ]; then
212-
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
213-
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
214-
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
215-
else
216-
echo '{"features": {"containerd-snapshotter": false}}' \
217-
| sudo tee "$DAEMON_JSON" > /dev/null
218-
fi
219-
sudo systemctl restart docker
220-
docker version
221-
docker info
222-
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
223207
- uses: actions/download-artifact@v4
224208
name: Download distribution tar
225209
with:
@@ -755,22 +739,6 @@ jobs:
755739
with:
756740
submodules: true
757741
persist-credentials: false
758-
- name: Disable containerd image store
759-
shell: bash
760-
run: |
761-
DAEMON_JSON="/etc/docker/daemon.json"
762-
if [ -f "$DAEMON_JSON" ]; then
763-
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
764-
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
765-
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
766-
else
767-
echo '{"features": {"containerd-snapshotter": false}}' \
768-
| sudo tee "$DAEMON_JSON" > /dev/null
769-
fi
770-
sudo systemctl restart docker
771-
docker version
772-
docker info
773-
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
774742
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
775743
- uses: apache/skywalking-cli/actions/setup@master
776744
with:
@@ -811,7 +779,7 @@ jobs:
811779
if: matrix.test.docker != null
812780
run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }}
813781
- name: ${{ matrix.test.name }}
814-
uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
782+
uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
815783
with:
816784
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
817785
- if: ${{ failure() }}
@@ -855,22 +823,6 @@ jobs:
855823
with:
856824
submodules: true
857825
persist-credentials: false
858-
- name: Disable containerd image store
859-
shell: bash
860-
run: |
861-
DAEMON_JSON="/etc/docker/daemon.json"
862-
if [ -f "$DAEMON_JSON" ]; then
863-
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
864-
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
865-
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
866-
else
867-
echo '{"features": {"containerd-snapshotter": false}}' \
868-
| sudo tee "$DAEMON_JSON" > /dev/null
869-
fi
870-
sudo systemctl restart docker
871-
docker version
872-
docker info
873-
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
874826
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
875827
- uses: apache/skywalking-cli/actions/setup@master
876828
with:
@@ -891,7 +843,7 @@ jobs:
891843
username: ${{ github.repository_owner }}
892844
password: ${{ secrets.GITHUB_TOKEN }}
893845
- name: ${{ matrix.test.name }}
894-
uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
846+
uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
895847
env:
896848
ISTIO_VERSION: ${{ matrix.versions.istio }}
897849
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -932,22 +884,6 @@ jobs:
932884
with:
933885
submodules: true
934886
persist-credentials: false
935-
- name: Disable containerd image store
936-
shell: bash
937-
run: |
938-
DAEMON_JSON="/etc/docker/daemon.json"
939-
if [ -f "$DAEMON_JSON" ]; then
940-
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
941-
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
942-
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
943-
else
944-
echo '{"features": {"containerd-snapshotter": false}}' \
945-
| sudo tee "$DAEMON_JSON" > /dev/null
946-
fi
947-
sudo systemctl restart docker
948-
docker version
949-
docker info
950-
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
951887
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
952888
- uses: apache/skywalking-cli/actions/setup@master
953889
with:
@@ -968,7 +904,7 @@ jobs:
968904
username: ${{ github.repository_owner }}
969905
password: ${{ secrets.GITHUB_TOKEN }}
970906
- name: ${{ matrix.test.name }}
971-
uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
907+
uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
972908
env:
973909
ISTIO_VERSION: ${{ matrix.versions.istio }}
974910
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -1004,22 +940,6 @@ jobs:
1004940
with:
1005941
submodules: true
1006942
persist-credentials: false
1007-
- name: Disable containerd image store
1008-
shell: bash
1009-
run: |
1010-
DAEMON_JSON="/etc/docker/daemon.json"
1011-
if [ -f "$DAEMON_JSON" ]; then
1012-
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
1013-
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
1014-
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
1015-
else
1016-
echo '{"features": {"containerd-snapshotter": false}}' \
1017-
| sudo tee "$DAEMON_JSON" > /dev/null
1018-
fi
1019-
sudo systemctl restart docker
1020-
docker version
1021-
docker info
1022-
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
1023943
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
1024944
- uses: apache/skywalking-cli/actions/setup@master
1025945
with:
@@ -1047,7 +967,7 @@ jobs:
1047967
shell: bash
1048968
run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package
1049969
- name: Java version ${{ matrix.java-version }}
1050-
uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
970+
uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
1051971
env:
1052972
SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
1053973
with:
@@ -1143,7 +1063,7 @@ jobs:
11431063
# fi
11441064
# docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v
11451065
# - name: ${{ matrix.test.name }}
1146-
# uses: apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
1066+
# uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
11471067
# with:
11481068
# e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
11491069
# - if: ${{ failure() }}

0 commit comments

Comments
 (0)