Skip to content

Commit a4994a5

Browse files
peachisaipeachisai
committed
Revert "Begin 9.7.0 iteration, 9.6.0 is tagged for release. (apache#791)"
This reverts commit b03d63c.
1 parent 713da64 commit a4994a5

272 files changed

Lines changed: 351 additions & 663 deletions

File tree

Some content is hidden

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ 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/
9291
echo "::endgroup::"
9392
- uses: actions/upload-artifact@v4
9493
name: Upload Test Containers

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,6 @@ 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"
5135
- name: Load Test Containers
5236
shell: bash
5337
run: |
@@ -57,7 +41,6 @@ runs:
5741
if ls test-containers/skywalking-agent-test-tomcat-1.0.0.tgz; then
5842
docker load -i test-containers/skywalking-agent-test-tomcat-1.0.0.tgz
5943
fi
60-
docker images
6144
- name: Cache local Maven repository
6245
uses: actions/cache@v4
6346
with:
@@ -68,7 +51,7 @@ runs:
6851
shell: bash
6952
run: |
7053
echo "::group::Run Plugin Test ${{ inputs.test_case }}"
71-
bash test/plugin/run.sh --debug ${{ inputs.test_case }}
54+
bash test/plugin/run.sh ${{ inputs.test_case }}
7255
echo "::endgroup::"
7356
- uses: actions/upload-artifact@v4
7457
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@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
63+
uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
6464
with:
6565
e2e-file: ${{ matrix.case.path }}
6666
- uses: actions/upload-artifact@v4

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146
with:

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146
with:

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146
with:

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146
with:

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build local tomcat-curl image
6045
run: |
6146
docker build -t tomcat-curl:10.1.50-jdk25-temurin \

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ 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"
5944
- name: Build
6045
uses: ./.github/actions/build
6146

0 commit comments

Comments
 (0)