fix check for remote running

smartcontractkit · Jan 18, 2024 · 08618c2 · 08618c2
1 parent 7d891d5
commit 08618c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml
@@ -68,21 +68,7 @@ jobs:
           fi   
           if [ -n "$NETWORKS" ]; then
             echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV           
-          fi
-
-          # use Loki config from GH secrets and merge it with base64 input
-          cat << EOF > config.toml
-          [Logging.Loki]
-          tenant_id="$LOKI_TENANT_ID"
-          endpoint="$LOKI_URL"
-          basic_auth="$LOKI_BASIC_AUTH"
-          EOF
-
-          echo "$decoded_toml" >> final_config.toml
-          cat config.toml >> final_config.toml
-          BASE64_CONFIG_OVERRIDE=$(cat final_config.toml | base64 -w 0)
-          echo ::add-mask::$BASE64_CONFIG_OVERRIDE
-          echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV          
+          fi     
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:

diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go
@@ -19,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	k8s_config "github.com/smartcontractkit/chainlink-testing-framework/k8s/config"
-	k8s_env "github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/osutil"
 	a_config "github.com/smartcontractkit/chainlink/integration-tests/testconfig/automation"
@@ -347,8 +346,8 @@ func (c *TestConfig) Validate() error {
 	}
 
 	// require Loki config only if these tests run locally
-	k8sEnv := k8s_env.Environment{}
-	if !k8sEnv.WillUseRemoteRunner() && slices.Contains(TestTypesWithLoki, c.ConfigurationName) {
+	_, willUseRemoteRunner := os.LookupEnv(k8s_config.EnvVarJobImage)
+	if !willUseRemoteRunner && slices.Contains(TestTypesWithLoki, c.ConfigurationName) {
 		if c.Logging.Loki == nil {
 			return fmt.Errorf("for local execution you must set Loki config in logging config")
 		}