Skip to content

Commit b03d63c

Browse files
wu-shengwu-sheng
authored
Begin 9.7.0 iteration, 9.6.0 is tagged for release. (#791)
1 parent ea25bfe commit b03d63c

File tree

272 files changed

+663
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+663
-351
lines changed

‎.github/actions/build/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ runs:
8888
mkdir -p test-containers
8989
docker save -o test-containers/skywalking-agent-test-jvm-1.0.0.tgz skywalking/agent-test-jvm:1.0.0
9090
docker save -o test-containers/skywalking-agent-test-tomcat-1.0.0.tgz skywalking/agent-test-tomcat:1.0.0
91+
ls -la test-containers/
9192
echo "::endgroup::"
9293
- uses: actions/upload-artifact@v4
9394
name: Upload Test Containers

‎.github/actions/run/action.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@ runs:
3232
- uses: actions/download-artifact@v4
3333
with:
3434
name: test-tools
35+
- name: Disable containerd image store
36+
shell: bash
37+
run: |
38+
DAEMON_JSON="/etc/docker/daemon.json"
39+
if [ -f "$DAEMON_JSON" ]; then
40+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
41+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
42+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
43+
else
44+
echo '{"features": {"containerd-snapshotter": false}}' \
45+
| sudo tee "$DAEMON_JSON" > /dev/null
46+
fi
47+
sudo systemctl restart docker
48+
docker version
49+
docker info
50+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
3551
- name: Load Test Containers
3652
shell: bash
3753
run: |
@@ -41,6 +57,7 @@ runs:
4157
if ls test-containers/skywalking-agent-test-tomcat-1.0.0.tgz; then
4258
docker load -i test-containers/skywalking-agent-test-tomcat-1.0.0.tgz
4359
fi
60+
docker images
4461
- name: Cache local Maven repository
4562
uses: actions/cache@v4
4663
with:
@@ -51,7 +68,7 @@ runs:
5168
shell: bash
5269
run: |
5370
echo "::group::Run Plugin Test ${{ inputs.test_case }}"
54-
bash test/plugin/run.sh ${{ inputs.test_case }}
71+
bash test/plugin/run.sh --debug ${{ inputs.test_case }}
5572
echo "::endgroup::"
5673
- uses: actions/upload-artifact@v4
5774
name: Upload Agent

‎.github/workflows/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
with:
6161
go-version: '1.24'
6262
- name: Run E2E Tests
63-
uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
63+
uses: apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
6464
with:
6565
e2e-file: ${{ matrix.case.path }}
6666
- uses: actions/upload-artifact@v4

‎.github/workflows/plugins-jdk11-test.3.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661
with:

‎.github/workflows/plugins-jdk17-test.0.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661
with:

‎.github/workflows/plugins-jdk17-test.1.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661
with:

‎.github/workflows/plugins-jdk21-test.0.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661
with:

‎.github/workflows/plugins-jdk25-test.0.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build local tomcat-curl image
4560
run: |
4661
docker build -t tomcat-curl:10.1.50-jdk25-temurin \

‎.github/workflows/plugins-test.0.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661

‎.github/workflows/plugins-test.1.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ jobs:
4141
- uses: actions/checkout@v2
4242
with:
4343
submodules: true
44+
- name: Disable containerd image store
45+
run: |
46+
DAEMON_JSON="/etc/docker/daemon.json"
47+
if [ -f "$DAEMON_JSON" ]; then
48+
sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
49+
| sudo tee "${DAEMON_JSON}.tmp" > /dev/null
50+
sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
51+
else
52+
echo '{"features": {"containerd-snapshotter": false}}' \
53+
| sudo tee "$DAEMON_JSON" > /dev/null
54+
fi
55+
sudo systemctl restart docker
56+
docker version
57+
docker info
58+
echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV"
4459
- name: Build
4560
uses: ./.github/actions/build
4661

0 commit comments

Comments
 (0)