Skip to content

Commit c11ad03

Browse files
kezhenxu94kezhenxu94
authored
Count the coverage in E2E tests and Plugin tests (apache#4651)
1 parent 181bf13 commit c11ad03

File tree

144 files changed

+703
-1710
lines changed

Some content is hidden

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

144 files changed

+703
-1710
lines changed

‎.github/workflows/ci-it.yaml‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ on:
2323
- master
2424
tags:
2525
- 'v*'
26-
26+
27+
env:
28+
MAVEN_OPTS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit
29+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2730

2831
jobs:
2932
CI:
3033
runs-on: ubuntu-18.04
3134
timeout-minutes: 90
32-
strategy:
33-
fail-fast: true
3435
steps:
3536
- uses: actions/checkout@v2
36-
# In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
3737
- name: checkout submodules
3838
shell: bash
3939
run: |
@@ -44,20 +44,16 @@ jobs:
4444
java-version: 8
4545
- name: 'Install & Test'
4646
run: |
47-
export MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
4847
./mvnw --batch-mode -P"agent,backend,ui,dist,CI-with-IT" clean cobertura:cobertura verify install javadoc:javadoc
49-
CODECOV_TOKEN="d2065307-8f01-4637-9715-2781ef096db7" bash <(curl -s https://codecov.io/bash)
48+
bash <(curl -s https://codecov.io/bash)
5049
- name: 'Check Dependencies Licenses'
5150
run: tools/dependencies/check-LICENSE.sh
5251

5352
CI-on-Windows:
54-
runs-on: Windows-latest
53+
runs-on: windows-latest
5554
timeout-minutes: 90
56-
strategy:
57-
fail-fast: true
5855
steps:
5956
- uses: actions/checkout@v2
60-
# In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
6157
- name: checkout submodules
6258
shell: bash
6359
run: |
@@ -67,19 +63,14 @@ jobs:
6763
with:
6864
java-version: 8
6965
- name: 'Install & Test'
70-
run: |
71-
set MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
72-
./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install
66+
run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install
7367

7468

7569
CI-on-MacOS:
7670
runs-on: macos-latest
7771
timeout-minutes: 90
78-
strategy:
79-
fail-fast: true
8072
steps:
8173
- uses: actions/checkout@v2
82-
# In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
8374
- name: checkout submodules
8475
shell: bash
8576
run: |
@@ -89,6 +80,4 @@ jobs:
8980
with:
9081
java-version: 8
9182
- name: 'Install & Test'
92-
run: |
93-
export MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
94-
./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install
83+
run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install

‎.github/workflows/e2e.cluster.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626

2727
env:
2828
SKIP_TEST: true
29+
SW_AGENT_JDK_VERSION: 8
30+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2931

3032
jobs:
3133
CoordinatorsStorage:
@@ -52,6 +54,8 @@ jobs:
5254
run: cp -R dist test/e2e/
5355
- name: Cluster with ${{ matrix.coordinator }} and ${{ matrix.storage }}
5456
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ClusterE2E
57+
- name: Report Coverage
58+
run: bash -x tools/coverage/report.sh
5559
- uses: actions/upload-artifact@v1
5660
if: failure()
5761
with:
@@ -64,4 +68,4 @@ jobs:
6468
needs: [CoordinatorsStorage]
6569
steps:
6670
- name: Call me by your name
67-
run: echo "Birds of a feather flock together"
71+
run: echo "Birds of a feather flock together"

‎.github/workflows/e2e.jdk-versions.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626

2727
env:
2828
SKIP_TEST: true
29+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2930

3031
jobs:
3132
JavaVersions:
@@ -51,6 +52,8 @@ jobs:
5152
run: cp -R dist test/e2e/
5253
- name: Agent on JDK Version ${{ matrix.jdk }}
5354
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E
55+
- name: Report Coverage
56+
run: bash -x tools/coverage/report.sh
5457
- uses: actions/upload-artifact@v1
5558
if: failure()
5659
with:
@@ -63,4 +66,4 @@ jobs:
6366
needs: [JavaVersions]
6467
steps:
6568
- name: Singles Bar
66-
run: echo "Singles Bar - Miyuki Nakajima"
69+
run: echo "Singles Bar - Miyuki Nakajima"

‎.github/workflows/e2e.profiling.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626

2727
env:
2828
SKIP_TEST: true
29+
SW_AGENT_JDK_VERSION: 8
30+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2931

3032
jobs:
3133
Profiling:
@@ -50,7 +52,8 @@ jobs:
5052
run: cp -R dist test/e2e/
5153
- name: Profiling ${{ matrix.storage }}
5254
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.profile.ProfileE2E
53-
55+
- name: Report Coverage
56+
run: bash -x tools/coverage/report.sh
5457
- uses: actions/upload-artifact@v1
5558
if: failure()
5659
with:

‎.github/workflows/e2e.storages.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626

2727
env:
2828
SKIP_TEST: true
29+
SW_AGENT_JDK_VERSION: 8
30+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2931

3032
jobs:
3133
StoragePlugins:
@@ -50,6 +52,8 @@ jobs:
5052
run: cp -R dist test/e2e/
5153
- name: Storage ${{ matrix.storage }}
5254
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.storage.StorageE2E
55+
- name: Report Coverage
56+
run: bash -x tools/coverage/report.sh
5357
- uses: actions/upload-artifact@v1
5458
if: failure()
5559
with:
@@ -62,4 +66,4 @@ jobs:
6266
needs: [StoragePlugins]
6367
steps:
6468
- name: To pass or not pass
65-
run: echo "Just to make the GitHub merge button green"
69+
run: echo "Just to make the GitHub merge button green"

‎.github/workflows/e2e.ttl.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626

2727
env:
2828
SKIP_TEST: true
29+
SW_AGENT_JDK_VERSION: 8
30+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
2931

3032
jobs:
3133
TTL:
@@ -50,8 +52,10 @@ jobs:
5052
run: cp -R dist test/e2e/
5153
- name: TTL of storage ${{ matrix.storage }}
5254
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ttl.StorageTTLE2E
55+
- name: Report Coverage
56+
run: bash -x tools/coverage/report.sh
5357
- uses: actions/upload-artifact@v1
5458
if: failure()
5559
with:
5660
name: logs
57-
path: logs
61+
path: logs

‎.github/workflows/e2e.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ on:
2727
env:
2828
SKIP_TEST: true
2929
SW_AGENT_JDK_VERSION: 8
30+
CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
3031

3132
jobs:
3233
FeatureGroup01:
@@ -51,6 +52,8 @@ jobs:
5152
run: cp -R dist test/e2e/
5253
- name: ${{ matrix.case }}
5354
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E
55+
- name: Report Coverage
56+
run: bash -x tools/coverage/report.sh
5457
- uses: actions/upload-artifact@v1
5558
if: failure()
5659
with:
@@ -74,6 +77,8 @@ jobs:
7477
run: cp -R dist test/e2e/
7578
- name: Nginx Lua
7679
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.LuaE2E
80+
- name: Report Coverage
81+
run: bash -x tools/coverage/report.sh
7782
- uses: actions/upload-artifact@v1
7883
if: failure()
7984
with:
@@ -97,6 +102,8 @@ jobs:
97102
run: cp -R dist test/e2e/
98103
- name: Uninstrumnented gateway
99104
run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.GatewayE2E
105+
- name: Report Coverage
106+
run: bash -x tools/coverage/report.sh
100107
- uses: actions/upload-artifact@v1
101108
if: failure()
102109
with:

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,11 @@ name: PluginsTest
1818

1919
on:
2020
pull_request:
21-
paths:
22-
- '.github/workflows/plugins-test*.yaml'
23-
- 'apm-application-toolkit/**'
24-
- 'apm-commons/**'
25-
- 'apm-protocol/**'
26-
- 'apm-sniffer/**'
27-
- 'test/plugin/**'
28-
- '**/pom.xml'
29-
- '!test/e2e/**'
30-
- '!apm-webapp/**'
31-
- '!apm-dist/**'
32-
- '!apm-dist-es7/**'
33-
- '!apm-docker/**'
34-
- '!docs/**'
35-
- '!oap-server/**'
21+
push:
22+
branches:
23+
- master
24+
tags:
25+
- 'v*'
3626

3727
jobs:
3828
PluginsTest:
@@ -80,3 +70,5 @@ jobs:
8070
run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local
8171
- name: ${{ matrix.case.title }}
8272
run: bash test/plugin/run.sh ${{ matrix.case.name }}
73+
- name: Report Coverage
74+
run: bash -x tools/coverage/report.sh

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,11 @@ name: PluginsTest
1818

1919
on:
2020
pull_request:
21-
paths:
22-
- '.github/workflows/plugins-test*.yaml'
23-
- 'apm-application-toolkit/**'
24-
- 'apm-commons/**'
25-
- 'apm-protocol/**'
26-
- 'apm-sniffer/**'
27-
- 'test/plugin/**'
28-
- '**/pom.xml'
29-
- '!test/e2e/**'
30-
- '!apm-webapp/**'
31-
- '!apm-dist/**'
32-
- '!apm-dist-es7/**'
33-
- '!apm-docker/**'
34-
- '!docs/**'
35-
- '!oap-server/**'
21+
push:
22+
branches:
23+
- master
24+
tags:
25+
- 'v*'
3626

3727
jobs:
3828
PluginsTest:
@@ -74,3 +64,5 @@ jobs:
7464
run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local
7565
- name: ${{ matrix.case.title }}
7666
run: bash test/plugin/run.sh ${{ matrix.case.name }}
67+
- name: Report Coverage
68+
run: bash -x tools/coverage/report.sh

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,11 @@ name: PluginsTest
1818

1919
on:
2020
pull_request:
21-
paths:
22-
- '.github/workflows/plugins-test*.yaml'
23-
- 'apm-application-toolkit/**'
24-
- 'apm-commons/**'
25-
- 'apm-protocol/**'
26-
- 'apm-sniffer/**'
27-
- 'test/plugin/**'
28-
- '**/pom.xml'
29-
- '!test/e2e/**'
30-
- '!apm-webapp/**'
31-
- '!apm-dist/**'
32-
- '!apm-dist-es7/**'
33-
- '!apm-docker/**'
34-
- '!docs/**'
35-
- '!oap-server/**'
21+
push:
22+
branches:
23+
- master
24+
tags:
25+
- 'v*'
3626

3727
jobs:
3828
PluginsTest:
@@ -84,4 +74,6 @@ jobs:
8474
- name: Build Docker image
8575
run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local
8676
- name: ${{ matrix.case.title }}
87-
run: bash test/plugin/run.sh ${{ matrix.case.name }}
77+
run: bash test/plugin/run.sh ${{ matrix.case.name }}
78+
- name: Report Coverage
79+
run: bash -x tools/coverage/report.sh

0 commit comments

Comments
 (0)