Merge branch 'master' into ports-exposed

Author: rnorth

.github/workflows/ci.yml

@@ -9,6 +9,14 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 jobs:
+  thundra_test_initializer:
+    runs-on: ubuntu-latest
+    outputs:
+      thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: thundra_test_initializer
+        uses: thundra-io/thundra-test-init-action@v1
   find_gradle_jobs:
     runs-on: ubuntu-18.04
     outputs:
@@ -34,7 +42,7 @@ jobs:
           echo $TASKS
           echo "::set-output name=matrix::{\"gradle_args\":$TASKS}"
   check:
-    needs: [find_gradle_jobs]
+    needs: [find_gradle_jobs, thundra_test_initializer]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
@@ -53,6 +61,16 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
       - name: Clear existing docker image cache
         run: docker image prune -af
+      - name: Thundra Gradle Test Instrumentation
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: thundra-io/thundra-gradle-test-action@v1
+        with:
+          apikey: ${{ secrets.THUNDRA_API_KEY }}
+          project_id: ${{ secrets.THUNDRA_PROJECT_ID }}
       - name: Build and test with Gradle (${{matrix.gradle_args}})
         run: |
-          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}}
+          ./gradlew --no-daemon --continue --scan ${{matrix.gradle_args}} \
+            $([[ -f $THUNDRA_GRADLE_INIT_SCRIPT_PATH ]] && echo "--init-script $THUNDRA_GRADLE_INIT_SCRIPT_PATH")
+        env:
+          THUNDRA_AGENT_TEST_RUN_ID: ${{ needs.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
+          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1

azure-pipelines.yml

@@ -3,21 +3,6 @@ jobs:
 - job: azure_pipeline_tests
   steps:
 
-  # Run a minimal set of tests in normal Linux pipeline builds
-  - task: Gradle@2
-    condition: eq(variables['Agent.OS'], 'Linux')
-    displayName: Build & test (Linux - minimal core)
-    env:
-      AWS_ACCESS_KEY_ID: $(aws.accessKeyId)
-      AWS_SECRET_ACCESS_KEY: $(aws.secretAccessKey)
-    inputs:
-        gradleWrapperFile: 'gradlew'
-        jdkVersionOption: '1.11'
-        options: "--no-daemon --continue"
-        tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
-        publishJUnitResults: true
-        testResultsFiles: '**/TEST-*.xml'
-
   # Run all core tests when running the Windows CI tests
   - task: Gradle@2
     condition: eq(variables['Agent.OS'], 'Windows_NT')