Merge branch 'main' into 10-29-add_token_v2_tests_txns

.github/workflows/docker-build-test.yaml

@@ -277,6 +277,7 @@ jobs:
       # by this GHA. If there is a Forge namespace collision, Forge will pre-empt the existing test running in the namespace.
       FORGE_NAMESPACE: forge-e2e-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
       SKIP_JOB: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' }}
+      SEND_RESULTS_TO_TRUNK: true
 
   # This job determines the last released docker image tag, which is used by forge compat test.
   fetch-last-released-docker-image-tag:
@@ -356,6 +357,7 @@ jobs:
       COMMENT_HEADER: forge-compat
       FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
       SKIP_JOB: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' }}
+      SEND_RESULTS_TO_TRUNK: true
 
   # Run forge framework upgradability test. This is a PR required job.
   forge-framework-upgrade-test:
@@ -385,6 +387,7 @@ jobs:
       COMMENT_HEADER: forge-framework-upgrade
       FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
       SKIP_JOB: ${{ !contains(github.event.pull_request.labels.*.name, 'CICD:run-framework-upgrade-test') && (needs.test-target-determinator.outputs.run_framework_upgrade_test == 'false') }}
+      SEND_RESULTS_TO_TRUNK: true
 
   forge-consensus-only-perf-test:
     needs:

.github/workflows/workflow-run-forge.yaml

@@ -87,6 +87,10 @@ on:
         required: false
         type: string
         description: The deployer profile used to spin up and configure forge infrastructure
+      SEND_RESULTS_TO_TRUNK:
+        required: false
+        type: boolean
+        description: Send forge results to trunk.io
 
 env:
   AWS_ACCOUNT_NUM: ${{ secrets.ENV_ECR_AWS_ACCOUNT_NUM }}
@@ -118,6 +122,7 @@ env:
   VERBOSE: true
   FORGE_NUM_VALIDATORS: ${{ inputs.FORGE_NUM_VALIDATORS }}
   FORGE_NUM_VALIDATOR_FULLNODES: ${{ inputs.FORGE_NUM_VALIDATOR_FULLNODES }}
+  FORGE_JUNIT_XML_PATH: ${{ inputs.SEND_RESULTS_TO_TRUNK && '/tmp/test.xml' || '' }}
 
 # TODO: should we migrate this to a composite action, so that we can skip it
 # at the call site, and don't need to wrap each step in an if statement?
@@ -228,3 +233,14 @@ jobs:
       # Print out whether the job was skipped.
       - run: echo "Skipping forge test!"
         if: ${{ inputs.SKIP_JOB }}
+
+      - name: Upload results
+        # Run this step even if the test step ahead fails
+        if: ${{ !inputs.SKIP_JOB && inputs.SEND_RESULTS_TO_TRUNK && !cancelled() }}
+        uses: trunk-io/analytics-uploader@main
+        with:
+          # Configured in the nextest.toml file
+          junit-paths: ${{ env.FORGE_JUNIT_XML_PATH }}
+          org-slug: aptoslabs
+          token: ${{ secrets.TRUNK_API_TOKEN }}
+        continue-on-error: true