Run smoketests in parallel (#2622)

This commit is contained in:
Lauri Tulmin 2021-03-24 08:31:12 +02:00 committed by GitHub
parent 116cd2d90d
commit e3155ed977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions

View File

@ -97,6 +97,10 @@ jobs:
smoke-test: smoke-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
suite: ["glassfishAndJetty", "libertyAndTomcat", "tomeeAndWildfly", "other"]
fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -113,7 +117,7 @@ jobs:
job-id: smokeTests job-id: smokeTests
- name: Test - name: Test
run: ./gradlew :smoke-tests:test run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
setup-muzzle-matrix: setup-muzzle-matrix:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -144,7 +148,7 @@ jobs:
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 11
- name: Run muzzle - name: Run muzzle
run: ./gradlew ${{ matrix.module }}:muzzle --no-daemon run: ./gradlew ${{ matrix.module }}:muzzle --no-daemon
accept-pr: accept-pr:

View File

@ -38,6 +38,25 @@ test {
//In addition to that we disable them by default on local machines //In addition to that we disable them by default on local machines
enabled = enabled && (System.getenv("CI") != null || findProperty('runSmokeTests')) enabled = enabled && (System.getenv("CI") != null || findProperty('runSmokeTests'))
def suites = [
"glassfishAndJetty": ["**/GlassFishSmokeTest.*", "**/JettySmokeTest.*"],
"libertyAndTomcat": ["**/LibertySmokeTest.*", "**/LibertyServletOnlySmokeTest.*", "**/TomcatSmokeTest.*"],
"tomeeAndWildfly": ["**/TomeeSmokeTest.*", "**/WildflySmokeTest.*"]
]
def suite = findProperty('smokeTestSuite')
if (suite != null) {
if ('other' == suite) {
suites.values().each {
exclude it
}
} else if (suites.containsKey(suite)) {
include suites.get(suite)
} else {
throw new GradleException('Unknown smoke test suite: ' + suite)
}
}
doFirst { doFirst {
jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':javaagent').tasks.shadowJar.archivePath}" jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':javaagent').tasks.shadowJar.archivePath}"
} }