Merge branch 'TT-1550-Provide-PoC-for-keeping-test-configs-in-git' in…

…to TT-1550-automation
smartcontractkit · Sep 18, 2024 · a2bcc37 · a2bcc37
2 parents f279c34 + e1bc870
commit a2bcc37
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/run-e2e-tests-reusable-workflow.yml b/.github/workflows/run-e2e-tests-reusable-workflow.yml
@@ -885,7 +885,7 @@ jobs:
                       "type": "section",
                       "text": {
                         "type": "mrkdwn",
-                        "text": "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Build Details>"
+                        "text": "<${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}|tag: ${{ github.ref_name }}> | <${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|sha: ${{ github.sha }}> | <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Details>"
                       }
                     }
                   ]

diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go
@@ -312,6 +312,18 @@ func GetConfig(configurationNames []string, product Product) (TestConfig, error)
 	testConfig := TestConfig{}
 	testConfig.ConfigurationNames = configurationNames
 
+	logger.Info().Msg("Setting env vars from testsecrets dot-env files")
+	err := ctf_config.LoadSecretEnvsFromFiles()
+	if err != nil {
+		return TestConfig{}, errors.Wrapf(err, "error reading test config values from ~/.testsecrets file")
+	}
+
+	logger.Info().Msg("Reading config values from existing env vars")
+	err = testConfig.ReadFromEnvVar()
+	if err != nil {
+		return TestConfig{}, errors.Wrapf(err, "error reading test config values from env vars")
+	}
+
 	logger.Debug().Msgf("Will apply configurations named '%s' if they are found in any of the configs", strings.Join(configurationNames, ","))
 
 	// read embedded configs is build tag "embed" is set
@@ -365,18 +377,6 @@ func GetConfig(configurationNames []string, product Product) (TestConfig, error)
 		}
 	}
 
-	logger.Info().Msg("Setting env vars from testsecrets dot-env files")
-	err := ctf_config.LoadSecretEnvsFromFiles()
-	if err != nil {
-		return TestConfig{}, errors.Wrapf(err, "error reading test config values from ~/.testsecrets file")
-	}
-
-	logger.Info().Msg("Reading config values from existing env vars")
-	err = testConfig.ReadFromEnvVar()
-	if err != nil {
-		return TestConfig{}, errors.Wrapf(err, "error reading test config values from env vars")
-	}
-
 	logger.Info().Msgf("Overriding config from %s env var", Base64OverrideEnvVarName)
 	configEncoded, isSet := os.LookupEnv(Base64OverrideEnvVarName)
 	if isSet && configEncoded != "" {