Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
chore: initialise timeout factor next to the declaration (#1118)
Browse files Browse the repository at this point in the history
* chore: initialise timeout factor on its own package

* chore: reuse timeout factor from common

(cherry picked from commit 15a2a3d)

# Conflicts:
#	e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
  • Loading branch information
mdelapenya authored and mergify-bot committed May 4, 2021
1 parent c0ab061 commit 4624690
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
1 change: 0 additions & 1 deletion e2e/_suites/fleet/ingest_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func setUpSuite() {
}
common.AgentVersionBase = v

common.TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", common.TimeoutFactor)
common.AgentVersion = shell.GetEnv("BEAT_VERSION", common.AgentVersionBase)

// check if version is an alias
Expand Down
7 changes: 1 addition & 6 deletions e2e/_suites/helm/helm_charts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ var elasticAPMActive = false

var helmManager helm.Manager

// timeoutFactor a multiplier for the max timeout when doing backoff retries.
// It can be overriden by TIMEOUT_FACTOR env var
var timeoutFactor = 2

//nolint:unused
var kubectlClient kubectl.Kubectl

Expand Down Expand Up @@ -80,7 +76,6 @@ func setupSuite() {
helmVersion = shell.GetEnv("HELM_VERSION", helmVersion)
helmChartVersion = shell.GetEnv("HELM_CHART_VERSION", helmChartVersion)
kubernetesVersion = shell.GetEnv("KUBERNETES_VERSION", kubernetesVersion)
timeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", timeoutFactor)

stackVersion = shell.GetEnv("STACK_VERSION", stackVersion)
v, err := utils.GetElasticArtifactVersion(stackVersion)
Expand Down Expand Up @@ -187,7 +182,7 @@ func (ts *HelmChartTestSuite) aResourceWillExposePods(resourceType string) error
return err
}

maxTimeout := time.Duration(timeoutFactor) * time.Minute
maxTimeout := time.Duration(common.TimeoutFactor) * time.Minute

exp := common.GetExponentialBackOff(maxTimeout)
retryCount := 1
Expand Down
16 changes: 16 additions & 0 deletions e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@ import (
)

const defaultBeatVersion = "8.0.0-SNAPSHOT"
<<<<<<< HEAD
const defaultEventsWaitTimeout = 120 * time.Second
const defaultDeployWaitTimeout = 120 * time.Second
=======

var defaultEventsWaitTimeout = 60 * time.Second
var defaultDeployWaitTimeout = 60 * time.Second
>>>>>>> 15a2a3d7... chore: initialise timeout factor next to the declaration (#1118)

type podsManager struct {
kubectl kubernetesControl
Expand Down Expand Up @@ -387,7 +393,17 @@ func InitializeTestSuite(ctx *godog.TestSuiteContext) {
log.DeferExitHandler(cancel)

ctx.BeforeSuite(func() {
<<<<<<< HEAD
err := cluster.initialize(suiteContext)
=======
// init logger
config.Init()

defaultEventsWaitTimeout = defaultEventsWaitTimeout * time.Duration(common.TimeoutFactor)
defaultDeployWaitTimeout = defaultDeployWaitTimeout * time.Duration(common.TimeoutFactor)

err := cluster.Initialize(suiteContext, "testdata/kind.yml")
>>>>>>> 15a2a3d7... chore: initialise timeout factor next to the declaration (#1118)
if err != nil {
log.WithError(err).Fatal("Failed to initialize cluster")
}
Expand Down
5 changes: 5 additions & 0 deletions internal/common/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ import (
"time"

backoff "github.com/cenkalti/backoff/v4"
"github.com/elastic/e2e-testing/internal/shell"
)

// TimeoutFactor a multiplier for the max timeout when doing backoff retries.
// It can be overriden by TIMEOUT_FACTOR env var
var TimeoutFactor = 3

func init() {
TimeoutFactor = shell.GetEnvInteger("TIMEOUT_FACTOR", TimeoutFactor)
}

// GetExponentialBackOff returns a preconfigured exponential backoff instance
func GetExponentialBackOff(elapsedTime time.Duration) *backoff.ExponentialBackOff {
var (
Expand Down

0 comments on commit 4624690

Please sign in to comment.