Reduce smoke-test time by parallel jobs (#307)

* parallel smoke-tests

* gradle changes

Author: shantanu-vsbhosale

.github/workflows/smoke-test.yml

@@ -11,6 +11,10 @@ on:
 jobs:
   smoke-test:
     runs-on: ubuntu-20.04
+    strategy: 
+      matrix:
+        suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+      fail-fast: true  
     steps:
        # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
@@ -33,7 +37,7 @@ jobs:
             gradle-packages-${{ runner.os }}
 
       - name: smoke-test
-        run: make smoke-test
+        run: make smoke-test SMOKE_TEST_SUITE=${{ matrix.suite }}
         env: 
           JVM_OPTS: -Xmx1g
           TERM: dumb

Makefile

@@ -1,5 +1,6 @@
 DOCKER_IMAGE ?= hypertrace/javaagent
 DOCKER_TAG ?= latest
+SMOKE_TEST_SUITE ?= other 
 
 .PHONY: assemble
 assemble:
@@ -11,7 +12,7 @@ build:
 
 .PHONY: smoke-test
 smoke-test:
-	./gradlew :smoke-tests:test --stacktrace
+	./gradlew :smoke-tests:test -PsmokeTestSuite=${SMOKE_TEST_SUITE} --stacktrace
 
 .PHONY: muzzle
 muzzle:

smoke-tests/build.gradle.kts

@@ -32,6 +32,30 @@ tasks.test {
     }
 
     maxParallelForks = 2
+
+    var suites : HashMap<String, String>
+            = HashMap()
+    suites.put("glassfish", "**/GlassFishSmokeTest.*")
+    suites.put("jetty", "**/JettySmokeTest.*")
+    suites.put("liberty", "**/LibertySmokeTest.*")
+    suites.put("tomcat", "**/TomcatSmokeTest.*")
+    suites.put("tomee" , "**/TomeeSmokeTest.*")
+    suites.put("wildfly", "**/WildflySmokeTest.*")
+
+    val suite = findProperty("smokeTestSuite")
+
+    if (suite != null) {
+        if ("other" == suite) {
+            for ((key, value) in suites) {
+                exclude(value)
+            }
+        } else if (suites.containsKey(suite)) {
+            include(suites.get(suite))
+        } else {
+            throw GradleException("Unknown smoke test suite: " + suite)
+        }
+    }
+
     val shadowTask : Jar = project(":javaagent").tasks.named<Jar>("shadowJar").get()
     inputs.files(layout.files(shadowTask))