Merge branch '7.13.x' into mergify/bp/7.13.x/pr-1137

mdelapenya · mdelapenya · commit 9794b6227ce0 · 2021-05-06T10:00:15.000+02:00
* 7.13.x: Pull fresh docker images before suite (#1123) (#1141)
diff --git a/e2e/README.md b/e2e/README.md
@@ -149,6 +149,7 @@ The following environment variables affect how the tests are run in both the CI
 >"ELASTIC_APM_ACTIVE" only affects Helm and Metricbeat test suites.
 
 - `ELASTIC_APM_ENVIRONMENT`: Set this environment variable to `ci` to send APM data to Elastic Cloud. Otherwise, the framework will spin up local APM Server and Kibana instances. For the CI, it will read credentials from Vault. Default value: `local`.
+- `SKIP_PULL`: Set this environment variable to prevent the test suite to pull Docker images for all components. Default: `false` 
 - `SKIP_SCENARIOS`: Set this environment variable to `false` if it's needed to include the scenarios annotated as `@skip` in the current test execution. Default value: `true`.
 - `BEATS_LOCAL_PATH`: Set this environment variable to the base path to your local clone of Beats if it's needed to use the binary snapshots produced by your local build instead of the official releases. The snapshots will be fetched from the `${BEATS_LOCAL_PATH}/${THE_BEAT}/build/distributions` local directory. This variable is intended to be used by Beats developers, when testing locally the artifacts generated its own build. Default: empty.
 - `BEATS_USE_CI_SNAPSHOTS`: Set this environment variable to `true` if it's needed to use the binary snapshots produced by Beats CI instead of the official releases. The snapshots will be downloaded from a bucket in Google Cloud Storage. This variable is used by the Beats repository, when testing the artifacts generated by the packaging job. Default: `false`.
diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/elastic/e2e-testing/cli/config"
 	"github.com/elastic/e2e-testing/internal/common"
 	"github.com/elastic/e2e-testing/internal/compose"
+	"github.com/elastic/e2e-testing/internal/docker"
 	"github.com/elastic/e2e-testing/internal/elasticsearch"
 	"github.com/elastic/e2e-testing/internal/installer"
 	"github.com/elastic/e2e-testing/internal/kibana"
@@ -130,11 +131,11 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {
 
 		log.Trace("Installing Fleet runtime dependencies")
 
-<<<<<<< HEAD
 		common.ProfileEnv = map[string]string{
 			"kibanaVersion": common.KibanaVersion,
 			"stackVersion":  common.StackVersion,
-=======
+		}
+
 		if !shell.GetEnvBool("SKIP_PULL") {
 			images := []string{
 				"docker.elastic.co/beats/elastic-agent:" + common.AgentVersion,
@@ -149,7 +150,6 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {
 				"docker.elastic.co/observability-ci/kibana-ubi8:" + common.KibanaVersion,
 			}
 			docker.PullImages(images)
->>>>>>> 4c0075fb... chore: abstract image pulling (#1137)
 		}
 
 		common.ProfileEnv["kibanaDockerNamespace"] = "kibana"
diff --git a/internal/docker/docker.go b/internal/docker/docker.go
@@ -9,6 +9,7 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -436,8 +437,6 @@ func getDockerClient() *client.Client {
 
 	return instance
 }
-<<<<<<< HEAD
-=======
 
 // PullImages pulls images
 func PullImages(images []string) error {
@@ -457,4 +456,3 @@ func PullImages(images []string) error {
 	}
 	return nil
 }
->>>>>>> 4c0075fb... chore: abstract image pulling (#1137)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"compress/gzip"`
`10`	`10`	`"context"`
`11`	`11`	`"fmt"`
	`12`	`+ "io"`
`12`	`13`	`"os"`
`13`	`14`	`"path/filepath"`
`14`	`15`	`"strings"`
`@@ -436,8 +437,6 @@ func getDockerClient() *client.Client {`
`436`	`437`
`437`	`438`	`return instance`
`438`	`439`	`}`
`439`		`-<<<<<<< HEAD`
`440`		`-=======`
`441`	`440`
`442`	`441`	`// PullImages pulls images`
`443`	`442`	`func PullImages(images []string) error {`
`@@ -457,4 +456,3 @@ func PullImages(images []string) error {`
`457`	`456`	`}`
`458`	`457`	`return nil`
`459`	`458`	`}`
`460`		`->>>>>>> 4c0075fb... chore: abstract image pulling (#1137)`