Skip to content

Commit 7597924

Browse files
committed
ci: speed up integration test
1 parent d69d8b7 commit 7597924

File tree

2 files changed

+49
-31
lines changed

2 files changed

+49
-31
lines changed

.github/workflows/test.yaml

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,37 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
middleware:
46-
- tomcat
47-
- jetty
48-
- jbossas
49-
- jbosseap
50-
- wildfly
51-
- glassfish
52-
- resin
53-
- payara
54-
- websphere
55-
- websphere7
56-
- springmvc
57-
- weblogic
58-
- springwebflux
59-
- xxljob
45+
cases:
46+
- middleware: "tomcat"
47+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-expression:war :vul:vul-webapp-deserialize:war :vul:vul-webapp-jakarta:war"
48+
- middleware: "jetty"
49+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
50+
- middleware: "jbossas"
51+
depend_tasks: ":vul:vul-webapp:war"
52+
- middleware: "jbosseap"
53+
depend_tasks: ":vul:vul-webapp:war"
54+
- middleware: "wildfly"
55+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
56+
- middleware: "glassfish"
57+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
58+
- middleware: "resin"
59+
depend_tasks: ":vul:vul-webapp:war"
60+
- middleware: "payara"
61+
depend_tasks: ":vul:vul-webapp:war :vul:vul-webapp-jakarta:war"
62+
- middleware: "websphere"
63+
depend_tasks: ":vul:vul-webapp:war"
64+
- middleware: "websphere7"
65+
depend_tasks: ":vul:vul-webapp:war"
66+
- middleware: "weblogic"
67+
depend_tasks: ":vul:vul-webapp:war"
68+
- middleware: "springmvc"
69+
depend_tasks: ":vul:vul-springboot1:bootJar :vul:vul-springboot2:bootJar :vul:vul-springboot2-jetty:bootJar :vul:vul-springboot2-undertow:bootJar :vul:vul-springboot2:bootWar :vul:vul-springboot3:bootJar"
70+
- middleware: "springwebflux"
71+
depend_tasks: ":vul:vul-springboot2-webflux:bootJar :vul:vul-springboot3-webflux:bootJar"
72+
- middleware: "xxljob"
73+
depend_tasks: ""
6074
runs-on: ubuntu-latest
61-
name: ${{ matrix.middleware }}
75+
name: ${{ matrix.cases.middleware }}
6276
needs: [ unit-test ]
6377
steps:
6478
- name: Checkout
@@ -73,7 +87,11 @@ jobs:
7387
- name: Setup Gradle
7488
uses: gradle/actions/setup-gradle@v4
7589

90+
- name: Prepare for Integration Test
91+
run: ./gradlew ${{ matrix.cases.depend_tasks }}
92+
7693
- name: Integration Test with gradle
77-
run: ./gradlew :integration-test:test --tests '*.${{ matrix.middleware }}.*' --info
94+
run: ./gradlew :integration-test:test --tests '*.${{ matrix.cases.middleware }}.*' --info
95+
7896
- name: Export Integration Test Summary
7997
run: cat integration-test/build/test-results/report.md >> $GITHUB_STEP_SUMMARY

integration-test/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ idea {
5151
}
5252

5353
test {
54-
dependsOn(
55-
":vul:vul-webapp:war",
56-
":vul:vul-webapp-expression:war",
57-
":vul:vul-webapp-deserialize:war",
58-
":vul:vul-webapp-jakarta:war",
59-
":vul:vul-springboot1:bootJar",
60-
":vul:vul-springboot2:bootJar",
61-
":vul:vul-springboot2-jetty:bootJar",
62-
":vul:vul-springboot2-undertow:bootJar",
63-
":vul:vul-springboot2:bootWar",
64-
":vul:vul-springboot2-webflux:bootJar",
65-
":vul:vul-springboot3:bootJar",
66-
":vul:vul-springboot3-webflux:bootJar",
67-
)
54+
// dependsOn(
55+
// ":vul:vul-webapp:war",
56+
// ":vul:vul-webapp-expression:war",
57+
// ":vul:vul-webapp-deserialize:war",
58+
// ":vul:vul-webapp-jakarta:war",
59+
// ":vul:vul-springboot1:bootJar",
60+
// ":vul:vul-springboot2:bootJar",
61+
// ":vul:vul-springboot2-jetty:bootJar",
62+
// ":vul:vul-springboot2-undertow:bootJar",
63+
// ":vul:vul-springboot2:bootWar",
64+
// ":vul:vul-springboot2-webflux:bootJar",
65+
// ":vul:vul-springboot3:bootJar",
66+
// ":vul:vul-springboot3-webflux:bootJar",
67+
// )
6868
useJUnitPlatform()
6969
finalizedBy jacocoTestReport
7070
}

0 commit comments

Comments
 (0)