From cd0bc3d0507d8dfc7974aa4b460b326a3de55753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 7 Jan 2021 10:58:46 +0100 Subject: [PATCH] fix: set image version before switching to the configuration file (#565) We still need to download the proper config file from the PR, but we do not have access to the commit SHA at this moment, unless other moddifications are in place, like reading from Jenkins --- e2e/_suites/metricbeat/metricbeat_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/_suites/metricbeat/metricbeat_test.go b/e2e/_suites/metricbeat/metricbeat_test.go index b37d4b9736..9e48ec53f8 100644 --- a/e2e/_suites/metricbeat/metricbeat_test.go +++ b/e2e/_suites/metricbeat/metricbeat_test.go @@ -246,14 +246,14 @@ func (mts *MetricbeatTestSuite) installedAndConfiguredForVariantModule(serviceVa } func (mts *MetricbeatTestSuite) installedUsingConfiguration(configuration string) error { - if strings.HasPrefix(metricbeatVersion, "pr-") { - metricbeatVersion = metricbeatVersionBase - } - // at this point we have everything to define the index name mts.Version = metricbeatVersion mts.setIndexName() + if strings.HasPrefix(metricbeatVersion, "pr-") { + metricbeatVersion = metricbeatVersionBase + } + // use master branch for snapshots tag := "v" + metricbeatVersion if strings.Contains(metricbeatVersion, "SNAPSHOT") {