[7.x](backport #1159) feat: simplify the initialisation of versions

e2e/_suites/fleet/stand-alone.go

@@ -106,7 +106,11 @@ func (fts *FleetTestSuite) startStandAloneAgent(image string, flavour string, en
 		// load the docker images that were already:
 		// a. downloaded from the GCP bucket
 		// b. fetched from the local beats binaries
+<<<<<<< HEAD
 		dockerInstaller := installer.GetElasticAgentInstaller("docker", image, common.BeatVersion, deployedAgentsCount)
+=======
+		dockerInstaller := installer.GetElasticAgentInstaller("docker", image, common.BeatVersion)
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 
 		dockerInstaller.PreInstallFn()
 

e2e/_suites/kubernetes-autodiscover/autodiscover_test.go

@@ -23,7 +23,11 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/elastic/e2e-testing/cli/config"
+<<<<<<< HEAD
 	"github.com/elastic/e2e-testing/internal/deploy"
+=======
+	"github.com/elastic/e2e-testing/internal/docker"
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 	"github.com/elastic/e2e-testing/internal/kubernetes"
 	"github.com/elastic/e2e-testing/internal/shell"
 	"github.com/elastic/e2e-testing/internal/utils"

e2e/_suites/metricbeat/metricbeat_test.go

@@ -33,7 +33,11 @@ var developerMode = false
 
 var elasticAPMActive = false
 
+<<<<<<< HEAD
 var serviceManager deploy.ServiceManager
+=======
+var serviceManager compose.ServiceManager
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 
 var testSuite MetricbeatTestSuite
 
@@ -57,7 +61,11 @@ func setupSuite() {
 
 	common.InitVersions()
 
+<<<<<<< HEAD
 	serviceManager = deploy.NewServiceManager()
+=======
+	serviceManager = compose.NewServiceManager()
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 
 	testSuite = MetricbeatTestSuite{
 		Query: elasticsearch.Query{},
@@ -385,7 +393,11 @@ func (mts *MetricbeatTestSuite) runMetricbeatService() error {
 
 		mts.Version = mts.Version + "-amd64"
 
+<<<<<<< HEAD
 		err = deploy.TagImage(
+=======
+		err = docker.TagImage(
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 			"docker.elastic.co/beats/metricbeat:"+common.BeatVersionBase,
 			"docker.elastic.co/observability-ci/metricbeat:"+mts.Version,
 		)

internal/common/defaults.go

@@ -29,7 +29,11 @@ const FleetProfileName = "fleet"
 const FleetServerAgentServiceName = "fleet-server"
 
 // BeatVersionBase is the base version of the Beat to use
+<<<<<<< HEAD
 var BeatVersionBase = "7.x-SNAPSHOT"
+=======
+var BeatVersionBase = "8.0.0-SNAPSHOT"
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 
 // BeatVersion is the version of the Beat to use
 // It can be overriden by BEAT_VERSION env var

internal/installer/docker.go

@@ -61,7 +61,11 @@ func (i *DockerPackage) Preinstall() error {
 	}
 
 	// we need to tag the loaded image because its tag relates to the target branch
+<<<<<<< HEAD
 	return deploy.TagImage(
+=======
+	return docker.TagImage(
+>>>>>>> 4c3d3ebe... feat: simplify the initialisation of versions (#1159)
 		"docker.elastic.co/beats/"+i.artifact+":"+common.BeatVersionBase,
 		"docker.elastic.co/observability-ci/"+i.artifact+":"+i.originalVersion+"-amd64",
 	)