chore: tag docker image after loading it from a file (#772)

mdelapenya · mdelapenya · commit 5c0fc33cdd0a · 2021-02-18T15:34:17.000+01:00
diff --git a/cli/docker/docker.go b/cli/docker/docker.go
@@ -206,6 +206,27 @@ func LoadImage(imagePath string) error {
 	return nil
 }
 
+// TagImage tags an existing src image into a target one
+func TagImage(src string, target string) error {
+	dockerClient := getDockerClient()
+
+	err := dockerClient.ImageTag(context.Background(), src, target)
+	if err != nil {
+		log.WithFields(log.Fields{
+			"error":  err,
+			"src":    src,
+			"target": target,
+		}).Error("Could not tag the Docker image.")
+		return err
+	}
+
+	log.WithFields(log.Fields{
+		"src":    src,
+		"target": target,
+	}).Debug("Docker image tagged successfully")
+	return nil
+}
+
 // RemoveDevNetwork removes the developer network
 func RemoveDevNetwork() error {
 	dockerClient := getDockerClient()
diff --git a/e2e/_suites/fleet/installers.go b/e2e/_suites/fleet/installers.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 
 	"github.com/elastic/e2e-testing/cli/docker"
+	"github.com/elastic/e2e-testing/e2e"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -109,10 +110,11 @@ type DockerPackage struct {
 	installerPath string
 	ubi8          bool
 	// optional fields
-	arch     string
-	artifact string
-	OS       string
-	version  string
+	arch            string
+	artifact        string
+	originalVersion string
+	OS              string
+	version         string
 }
 
 // NewDockerPackage creates an instance for the Docker installer
@@ -143,7 +145,17 @@ func (i *DockerPackage) InstallCerts() error {
 
 // Preinstall executes operations before installing a Docker package
 func (i *DockerPackage) Preinstall() error {
-	return docker.LoadImage(i.installerPath)
+	err := docker.LoadImage(i.installerPath)
+	if err != nil {
+		return err
+	}
+
+	// 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,
+	)
 }
 
 // Postinstall executes operations after installing a Docker package
@@ -178,7 +190,8 @@ func (i *DockerPackage) WithOS(OS string) *DockerPackage {
 
 // WithVersion sets the version
 func (i *DockerPackage) WithVersion(version string) *DockerPackage {
-	i.version = version
+	i.version = e2e.CheckPRVersion(version, agentVersionBase) // sanitize version
+	i.originalVersion = version
 	return i
 }
 
diff --git a/e2e/_suites/fleet/services.go b/e2e/_suites/fleet/services.go
@@ -387,7 +387,7 @@ func newDockerInstaller(ubi8 bool, version string) (ElasticAgentInstaller, error
 		WithArch(arch).
 		WithArtifact(artifact).
 		WithOS(os).
-		WithVersion(e2e.CheckPRVersion(version, agentVersionBase)) // sanitize version
+		WithVersion(version)
 
 	return ElasticAgentInstaller{
 		artifactArch:      arch,
diff --git a/e2e/_suites/metricbeat/metricbeat_test.go b/e2e/_suites/metricbeat/metricbeat_test.go
@@ -405,6 +405,11 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {
 		if err != nil {
 			return err
 		}
+
+		err = docker.TagImage(
+			"docker.elastic.co/beats/metricbeat:"+metricbeatVersionBase,
+			"docker.elastic.co/observability-ci/metricbeat:"+mts.Version,
+		)
 	}
 
 	// this is needed because, in general, the target service (apache, mysql, redis) does not have a healthcheck

Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,11 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {`
`405`	`405`	`if err != nil {`
`406`	`406`	`return err`
`407`	`407`	`}`
	`408`	`+`
	`409`	`+ err = docker.TagImage(`
	`410`	`+ "docker.elastic.co/beats/metricbeat:"+metricbeatVersionBase,`
	`411`	`+ "docker.elastic.co/observability-ci/metricbeat:"+mts.Version,`
	`412`	`+ )`
`408`	`413`	`}`
`409`	`414`
`410`	`415`	`// this is needed because, in general, the target service (apache, mysql, redis) does not have a healthcheck`