From 513423dfc61d337be861e182c2ca997486888771 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 9 Jan 2024 18:08:38 -0300 Subject: [PATCH] check what is the config missing --- .github/workflows/client-compatibility-tests.yml | 7 ++++--- integration-tests/testconfig/testconfig.go | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/client-compatibility-tests.yml b/.github/workflows/client-compatibility-tests.yml index 7b5c04c62a3..04e50a9e356 100644 --- a/.github/workflows/client-compatibility-tests.yml +++ b/.github/workflows/client-compatibility-tests.yml @@ -170,7 +170,8 @@ jobs: PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }} PYROSCOPE_ENVIRONMENT: ci-client-compatability-${{ matrix.client }}-testnet PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }} - ETH2_EL_CLIENT: ${{matrix.client}} + ETH2_EL_CLIENT: ${{matrix.client}} + CHAINLINK_VERSION: ${{ github.sha }} run: | convert_to_toml_array() { local IFS=',' @@ -199,7 +200,7 @@ jobs: [ChainlinkImage] image="$CHAINLINK_IMAGE" - version="${{ github.sha }}" + version="$CHAINLINK_VERSION" [Pyroscope] enabled=$pyroscope_enabled @@ -212,7 +213,7 @@ jobs: EOF BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0) - echo ::add-mask::$BASE64_CONFIG_OVERRIDE + # echo ::add-mask::$BASE64_CONFIG_OVERRIDE echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV touch .root_dir - name: Debug pwd diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go index b8d883b7e4b..895dcdafd57 100644 --- a/integration-tests/testconfig/testconfig.go +++ b/integration-tests/testconfig/testconfig.go @@ -196,7 +196,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { } if _, ok := someToml[configurationName]; !ok { - logger.Debug().Msgf("Config file %s does not contain configuration named '%s', skipping.", fileName, configurationName) + logger.Debug().Msgf("Config file %s does not contain configuration named '%s', will read only default configuration.", fileName, configurationName) continue } @@ -216,6 +216,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { configEncoded, isSet := os.LookupEnv(Base64OverrideEnvVarName) if isSet && configEncoded != "" { + logger.Debug().Msgf("Base64 config override from environment variable '%s' found", Base64OverrideEnvVarName) decoded, err := base64.StdEncoding.DecodeString(configEncoded) if err != nil { return TestConfig{}, err @@ -227,7 +228,6 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { return TestConfig{}, errors.Wrapf(err, "error unmarshaling base64 config") } - logger.Debug().Msgf("Applying base64 config override from environment variable %s", Base64OverrideEnvVarName) maybeTestConfigs = append(maybeTestConfigs, base64override) } else { logger.Debug().Msg("Base64 config override from environment variable not found") @@ -240,6 +240,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { return TestConfig{}, errors.Wrapf(err, "error applying secrets to network config") } + logger.Debug().Msg("Applying overrides to test config") for i := range maybeTestConfigs { err := testConfig.ApplyOverrides(&maybeTestConfigs[i]) if err != nil { @@ -248,6 +249,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { } testConfig.ConfigurationName = configurationName + logger.Debug().Msg("Validating test config") err = testConfig.Validate() if err != nil { return TestConfig{}, errors.Wrapf(err, "error validating test config") @@ -257,6 +259,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { testConfig.Common = &Common{} } + logger.Debug().Msg("Correct test config constructed successfully") return testConfig, nil }