Fix

smartcontractkit · Apr 16, 2024 · c04cbff · c04cbff
1 parent 69debaa
commit c04cbff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -372,7 +372,7 @@ jobs:
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@08210ca4289f40ae5f4d6b88bb9b7715a5864c37
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@1877ccce17d03bd8cb3a0644df598833d5e5470f
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -672,7 +672,7 @@ jobs:
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@1877ccce17d03bd8cb3a0644df598833d5e5470f
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -686,12 +686,20 @@ jobs:
           publish_check_name: ${{ matrix.product.name }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
+          go_coverage_dir: ./integration-tests/go-coverage
           cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ""
           should_tidy: "false"
+
+      - name: Upload Go Coverage Directory
+        uses: actions/upload-artifact@v3
+        with:
+          name: go-coverage-${{ matrix.product.name }}
+          path: ./integration-tests/go-coverage/
+
       # Run this step when changes that do not need the test to run are made
       - name: Run Setup
         if: needs.changes.outputs.src == 'false'

diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
@@ -258,8 +258,8 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 	case CleanUpTypeStandard:
 		b.t.Cleanup(func() {
 			// Save test coverage profile from node containers
-			baseCoverageDir, isSet := os.LookupEnv("GO_COVERAGE_DIR")
-			if isSet {
+			baseCoverageDir := os.Getenv("GO_COVERAGE_DIR")
+			if baseCoverageDir != "" {
 				testCoverageDir := fmt.Sprintf("%s/%s", baseCoverageDir, b.t.Name())
 				if err := os.MkdirAll(testCoverageDir, 0755); err != nil {
 					b.l.Error().Err(err).Str("coverageDir", testCoverageDir).Msg("Failed to create test coverage directory")