chore: append "-amd64" label for Docker images (#787)

mdelapenya · mdelapenya · commit bd23e4905560 · 2021-03-02T11:39:20.000+01:00
* chore: append "-amd64" suffix to docker images

* chore: append "-amd64" suffix for locally-loaded Docker images

* chore: make sure we tag the image after it's loaded

* fix: properly load &amp; tag ubi8 images

* fix: only add the platform label for local or CI snapshots
diff --git a/e2e/_suites/fleet/installers.go b/e2e/_suites/fleet/installers.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/elastic/e2e-testing/cli/docker"
 	"github.com/elastic/e2e-testing/e2e"
@@ -152,11 +153,14 @@ func (i *DockerPackage) Preinstall() error {
 		return err
 	}
 
+	// wait for tagging to ensure the loaded image is present
+	e2e.Sleep(3 * time.Second)
+
 	// we need to tag the loaded image because its tag relates to the target branch,
 	// and we want it to use the 'pr-12345' format.
 	return docker.TagImage(
 		"docker.elastic.co/beats/"+i.artifact+":"+agentVersionBase,
-		"docker.elastic.co/observability-ci/"+i.artifact+":"+i.originalVersion,
+		"docker.elastic.co/observability-ci/"+i.artifact+":"+i.originalVersion+"-amd64",
 	)
 }
 
diff --git a/e2e/_suites/fleet/services.go b/e2e/_suites/fleet/services.go
@@ -355,6 +355,7 @@ func newDockerInstaller(ubi8 bool, version string) (ElasticAgentInstaller, error
 	artifactName := artifact
 	if ubi8 {
 		artifactName = "elastic-agent-ubi8"
+		image = "elastic-agent-ubi8"
 	}
 
 	os := "linux"
@@ -383,9 +384,9 @@ func newDockerInstaller(ubi8 bool, version string) (ElasticAgentInstaller, error
 		return nil
 	}
 
-	installerPackage := NewDockerPackage(binaryName, profile, image, service, binaryPath, ubi8).
+	installerPackage := NewDockerPackage(binaryName, profile, artifactName, service, binaryPath, ubi8).
 		WithArch(arch).
-		WithArtifact(artifact).
+		WithArtifact(artifactName).
 		WithOS(os).
 		WithVersion(version)
 
diff --git a/e2e/_suites/fleet/stand-alone.go b/e2e/_suites/fleet/stand-alone.go
@@ -63,6 +63,8 @@ func (sats *StandAloneTestSuite) contributeSteps(s *godog.ScenarioContext) {
 func (sats *StandAloneTestSuite) aStandaloneAgentIsDeployed(image string) error {
 	log.Trace("Deploying an agent to Fleet")
 
+	dockerImageTag := agentVersion
+
 	useCISnapshots := shell.GetEnvBool("BEATS_USE_CI_SNAPSHOTS")
 	beatsLocalPath := shell.GetEnv("BEATS_LOCAL_PATH", "")
 	if useCISnapshots || beatsLocalPath != "" {
@@ -72,6 +74,8 @@ func (sats *StandAloneTestSuite) aStandaloneAgentIsDeployed(image string) error
 		dockerInstaller := GetElasticAgentInstaller("docker", image, agentVersion)
 
 		dockerInstaller.PreInstallFn()
+
+		dockerImageTag += "-amd64"
 	}
 
 	serviceManager := services.NewServiceManager()
@@ -96,7 +100,7 @@ func (sats *StandAloneTestSuite) aStandaloneAgentIsDeployed(image string) error
 	profileEnv["elasticAgentContainerName"] = containerName
 	profileEnv["elasticAgentConfigFile"] = sats.AgentConfigFilePath
 	profileEnv["elasticAgentPlatform"] = "linux/amd64"
-	profileEnv["elasticAgentTag"] = agentVersion
+	profileEnv["elasticAgentTag"] = dockerImageTag
 
 	err = serviceManager.AddServicesToCompose(context.Background(), FleetProfileName, []string{ElasticAgentServiceName}, profileEnv)
 	if err != nil {
diff --git a/e2e/_suites/metricbeat/metricbeat_test.go b/e2e/_suites/metricbeat/metricbeat_test.go
@@ -408,7 +408,7 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {
 
 		err = docker.TagImage(
 			"docker.elastic.co/beats/metricbeat:"+metricbeatVersionBase,
-			"docker.elastic.co/observability-ci/metricbeat:"+mts.Version,
+			"docker.elastic.co/observability-ci/metricbeat:"+mts.Version+"-amd64",
 		)
 	}
 
@@ -436,7 +436,7 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {
 		"metricbeatConfigFile":  mts.configurationFile,
 		"metricbeatTag":         mts.Version,
 		"stackVersion":          stackVersion,
-		mts.ServiceName + "Tag": mts.ServiceVersion,
+		mts.ServiceName + "Tag": mts.ServiceVersion + "-amd64",
 		"serviceName":           mts.ServiceName,
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package main`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
	`9`	`+ "time"`
`9`	`10`
`10`	`11`	`"github.com/elastic/e2e-testing/cli/docker"`
`11`	`12`	`"github.com/elastic/e2e-testing/e2e"`
`@@ -152,11 +153,14 @@ func (i *DockerPackage) Preinstall() error {`
`152`	`153`	`return err`
`153`	`154`	`}`
`154`	`155`
	`156`	`+ // wait for tagging to ensure the loaded image is present`
	`157`	`+ e2e.Sleep(3 * time.Second)`
	`158`	`+`
`155`	`159`	`// we need to tag the loaded image because its tag relates to the target branch,`
`156`	`160`	`// and we want it to use the 'pr-12345' format.`
`157`	`161`	`return docker.TagImage(`
`158`	`162`	`"docker.elastic.co/beats/"+i.artifact+":"+agentVersionBase,`
`159`		`- "docker.elastic.co/observability-ci/"+i.artifact+":"+i.originalVersion,`
	`163`	`+ "docker.elastic.co/observability-ci/"+i.artifact+":"+i.originalVersion+"-amd64",`
`160`	`164`	`)`
`161`	`165`	`}`
`162`	`166`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {`
`408`	`408`
`409`	`409`	`err = docker.TagImage(`
`410`	`410`	`"docker.elastic.co/beats/metricbeat:"+metricbeatVersionBase,`
`411`		`- "docker.elastic.co/observability-ci/metricbeat:"+mts.Version,`
	`411`	`+ "docker.elastic.co/observability-ci/metricbeat:"+mts.Version+"-amd64",`
`412`	`412`	`)`
`413`	`413`	`}`
`414`	`414`
`@@ -436,7 +436,7 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {`
`436`	`436`	`"metricbeatConfigFile": mts.configurationFile,`
`437`	`437`	`"metricbeatTag": mts.Version,`
`438`	`438`	`"stackVersion": stackVersion,`
`439`		`- mts.ServiceName + "Tag": mts.ServiceVersion,`
	`439`	`+ mts.ServiceName + "Tag": mts.ServiceVersion + "-amd64",`
`440`	`440`	`"serviceName": mts.ServiceName,`
`441`	`441`	`}`
`442`	`442`