[mq] working branch - merge da987d8 on top of main at 72d1826

{"baseBranch":"main","baseCommit":"72d182613c47bbea65d90f225a0a9ec99fdd9be1","createdAt":"2025-02-19T16:31:31.402199Z","headSha":"da987d85991ced785f84e19b405de1feaaf44078","id":"8943d5f5-1e66-4a67-b0ba-db0e2026933f","priority":"200","pullRequestNumber":"1416","queuedAt":"2025-02-19T16:31:31.401878Z","status":"STATUS_QUEUED"}

components/datadog/agent/docker_image.go

@@ -13,6 +13,7 @@ const (
 	defaultAgentImageRepo        = "gcr.io/datadoghq/agent"
 	defaultClusterAgentImageRepo = "gcr.io/datadoghq/cluster-agent"
 	defaultAgentImageTag         = "latest"
+	defaultAgent6ImageTag        = "6"
 	defaultDevAgentImageRepo     = "datadog/agent-dev" // Used as default repository for images that are not stable and released yet
 	defaultOTAgentImageTag       = "nightly-ot-beta-main"
 	jmxSuffix                    = "-jmx"
@@ -125,7 +126,12 @@ func dockerClusterAgentFullImagePath(e config.Env, repositoryPath string) string
 
 func dockerAgentImageTag(e config.Env, semverVersion func(config.Env) (*semver.Version, error)) string {
 	// default tag
-	agentImageTag := defaultAgentImageTag
+	var agentImageTag string
+	if e.MajorVersion() == "6" {
+		agentImageTag = defaultAgent6ImageTag
+	} else {
+		agentImageTag = defaultAgentImageTag
+	}
 
 	// try parse agent version
 	agentVersion, err := semverVersion(e)