From fa03339cb529b218f0598eafb9db3f434565c879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Sat, 15 May 2021 07:46:58 +0200 Subject: [PATCH 1/3] chore: use timeout factor when tagging docker images --- internal/deploy/docker_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/deploy/docker_client.go b/internal/deploy/docker_client.go index 22271af7aa..f6a6b4f7b4 100644 --- a/internal/deploy/docker_client.go +++ b/internal/deploy/docker_client.go @@ -386,7 +386,7 @@ func LoadImage(imagePath string) error { func TagImage(src string, target string) error { dockerClient := getDockerClient() - maxTimeout := 15 * time.Second + maxTimeout := 5 * time.Second * time.Duration(utils.TimeoutFactor) exp := utils.GetExponentialBackOff(maxTimeout) retryCount := 0 From b9e8b9bb416f4740395f2de007d4bb11dc1d388e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Sat, 15 May 2021 08:15:34 +0200 Subject: [PATCH 2/3] fix: resolve alias version in k8s-autodiscover test suite --- e2e/_suites/kubernetes-autodiscover/autodiscover_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go b/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go index 1cb724d515..1844ed219b 100644 --- a/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go +++ b/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go @@ -113,6 +113,11 @@ func (m *podsManager) configureDockerImage(podName string) error { } beatVersion := shell.GetEnv("BEAT_VERSION", defaultBeatVersion) + v, err := utils.GetElasticArtifactVersion(beatVersion) + if err != nil { + return err + } + beatVersion = v useCISnapshots := shell.GetEnvBool("BEATS_USE_CI_SNAPSHOTS") beatsLocalPath := shell.GetEnv("BEATS_LOCAL_PATH", "") From 5fa49e85536b7800d5ba2fecb62d6955d5268b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Sat, 15 May 2021 08:22:28 +0200 Subject: [PATCH 3/3] fix: use common versions for k8s-autodiscover --- .../autodiscover_test.go | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go b/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go index 1844ed219b..b27318a14b 100644 --- a/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go +++ b/e2e/_suites/kubernetes-autodiscover/autodiscover_test.go @@ -23,6 +23,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/elastic/e2e-testing/cli/config" + "github.com/elastic/e2e-testing/internal/common" "github.com/elastic/e2e-testing/internal/deploy" "github.com/elastic/e2e-testing/internal/kubernetes" "github.com/elastic/e2e-testing/internal/shell" @@ -31,8 +32,6 @@ import ( var beatVersions = map[string]string{} -const defaultBeatVersion = "8.0.0-SNAPSHOT" - var defaultEventsWaitTimeout = 60 * time.Second var defaultDeployWaitTimeout = 60 * time.Second @@ -112,12 +111,7 @@ func (m *podsManager) configureDockerImage(podName string) error { return nil } - beatVersion := shell.GetEnv("BEAT_VERSION", defaultBeatVersion) - v, err := utils.GetElasticArtifactVersion(beatVersion) - if err != nil { - return err - } - beatVersion = v + beatVersion := common.BeatVersion + "-amd64" useCISnapshots := shell.GetEnvBool("BEATS_USE_CI_SNAPSHOTS") beatsLocalPath := shell.GetEnv("BEATS_LOCAL_PATH", "") @@ -125,9 +119,9 @@ func (m *podsManager) configureDockerImage(podName string) error { log.Debugf("Configuring Docker image for %s", podName) // this method will detect if the GITHUB_CHECK_SHA1 variable is set - artifactName := utils.BuildArtifactName(podName, beatVersion, defaultBeatVersion, "linux", "amd64", "tar.gz", true) + artifactName := utils.BuildArtifactName(podName, common.BeatVersion, common.BeatVersionBase, "linux", "amd64", "tar.gz", true) - imagePath, err := utils.FetchBeatsBinary(artifactName, podName, beatVersion, defaultBeatVersion, utils.TimeoutFactor, true) + imagePath, err := utils.FetchBeatsBinary(artifactName, podName, common.BeatVersion, common.BeatVersionBase, utils.TimeoutFactor, true) if err != nil { return err } @@ -138,11 +132,9 @@ func (m *podsManager) configureDockerImage(podName string) error { return err } - beatVersion = beatVersion + "-amd64" - // tag the image with the proper docker tag, including platform err = deploy.TagImage( - "docker.elastic.co/beats/"+podName+":"+defaultBeatVersion, + "docker.elastic.co/beats/"+podName+":"+common.BeatVersionBase, "docker.elastic.co/observability-ci/"+podName+":"+beatVersion, ) if err != nil { @@ -468,6 +460,8 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) { // init logger config.Init() + common.InitVersions() + defaultEventsWaitTimeout = defaultEventsWaitTimeout * time.Duration(utils.TimeoutFactor) defaultDeployWaitTimeout = defaultDeployWaitTimeout * time.Duration(utils.TimeoutFactor)