[backport 7.66.x] Backport #36686 (#36722)

Co-authored-by: agent-platform-auto-pr[bot] <153269286+agent-platform-auto-pr[bot]@users.noreply.github.com>

Author: KevinFairise2

.gitlab/common/test_infra_version.yml

@@ -5,5 +5,5 @@
 
 ---
 variables:
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: d610d4c9aa4b
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: fa71308022b9
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''

test/new-e2e/go.mod

@@ -23,7 +23,7 @@ require (
 	// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version
 	// Example: 	github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB
 	// => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB
-	github.com/DataDog/test-infra-definitions v0.0.0-20250410185122-d610d4c9aa4b
+	github.com/DataDog/test-infra-definitions v0.0.0-20250506103533-fa71308022b9
 	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/config v1.29.11
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1

test/new-e2e/go.sum

@@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/DataDog/test-infra-definitions/components/datadog/apps/redis"
+
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
 	awsdocker "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/docker"
@@ -59,10 +61,10 @@ func (suite *DockerSuite) TestDockerMetrics() {
 		expectedTags := append([]string{
 			`^container_id:`,
 			`^container_name:redis$`,
-			`^docker_image:public.ecr.aws/docker/library/redis:latest$`,
+			fmt.Sprintf(`^docker_image:public.ecr.aws/docker/library/redis:%s$`, redis.RedisVersion),
 			`^image_id:sha256:`,
 			`^image_name:public.ecr.aws/docker/library/redis$`,
-			`^image_tag:latest$`,
+			fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 			`^runtime:docker$`,
 			`^short_image:redis$`,
 		}, extraTags...)
@@ -113,10 +115,10 @@ func (suite *DockerSuite) TestDockerMetrics() {
 		},
 		Expect: testMetricExpectArgs{
 			Tags: &[]string{
-				`^docker_image:public.ecr.aws/docker/library/redis:latest$`,
+				fmt.Sprintf(`^docker_image:public.ecr.aws/docker/library/redis:%s$`, redis.RedisVersion),
 				`^image_id:sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^short_image:redis$`,
 			},
 			Value: &testMetricExpectValueArgs{

test/new-e2e/tests/containers/docker_test.go

@@ -7,6 +7,7 @@ package containers
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 	"strings"
 	"testing"
@@ -24,6 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/DataDog/test-infra-definitions/components/datadog/apps/redis"
 	tifecs "github.com/DataDog/test-infra-definitions/scenarios/aws/ecs"
 
 	envecs "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/ecs"
@@ -251,14 +253,14 @@ func (suite *ecsSuite) TestRedisECS() {
 				`^cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
 				`^container_id:`,
 				`^container_name:ecs-.*-redis-ec2-`,
-				`^docker_image:public.ecr.aws/docker/library/redis:latest$`,
+				fmt.Sprintf(`^docker_image:public.ecr.aws/docker/library/redis:%s$`, redis.RedisVersion),
 				`^ecs_cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
 				`^ecs_container_name:redis$`,
 				`^ecs_service:` + regexp.QuoteMeta(strings.TrimSuffix(suite.ecsClusterName, "-ecs")) + `-redis-ec2$`,
 				`^ecs_launch_type:ec2$`,
 				`^image_id:sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^region:us-east-1$`,
 				`^short_image:redis$`,
 				`^task_arn:`,
@@ -281,14 +283,14 @@ func (suite *ecsSuite) TestRedisECS() {
 				`^cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
 				`^container_id:`,
 				`^container_name:ecs-.*-redis-ec2-`,
-				`^docker_image:public.ecr.aws/docker/library/redis:latest$`,
+				fmt.Sprintf(`^docker_image:public.ecr.aws/docker/library/redis:%s$`, redis.RedisVersion),
 				`^ecs_cluster_name:` + regexp.QuoteMeta(suite.ecsClusterName) + `$`,
 				`^ecs_container_name:redis$`,
 				`^ecs_launch_type:ec2$`,
 				`^ecs_service:` + regexp.QuoteMeta(strings.TrimSuffix(suite.ecsClusterName, "-ecs")) + `-redis-ec2$`,
 				`^image_id:sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^region:us-east-1$`,
 				`^short_image:redis$`,
 				`^task_arn:arn:`,
@@ -357,7 +359,7 @@ func (suite *ecsSuite) TestRedisFargate() {
 				`^ecs_launch_type:fargate`,
 				`^image_id:sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^region:us-east-1$`,
 				`^short_image:redis$`,
 				`^task_arn:`,

test/new-e2e/tests/containers/ecs_test.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/DataDog/agent-payload/v5/cyclonedx_v1_4"
 	"github.com/DataDog/agent-payload/v5/sbom"
+	"github.com/DataDog/test-infra-definitions/components/datadog/apps/redis"
 	"gopkg.in/zorkian/go-datadog-api.v2"
 
 	"github.com/DataDog/datadog-agent/pkg/util/pointer"
@@ -628,7 +629,7 @@ func (suite *k8sSuite) TestRedis() {
 				`^display_container_name:redis`,
 				`^image_id:public.ecr.aws/docker/library/redis@sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^kube_container_name:redis$`,
 				`^kube_deployment:redis$`,
 				`^kube_namespace:workload-redis$`,
@@ -684,7 +685,7 @@ func (suite *k8sSuite) TestRedis() {
 				`^filename:[[:digit:]]+.log$`,
 				`^image_id:public.ecr.aws/docker/library/redis@sha256:`,
 				`^image_name:public.ecr.aws/docker/library/redis$`,
-				`^image_tag:latest$`,
+				fmt.Sprintf(`^image_tag:%s$`, redis.RedisVersion),
 				`^kube_container_name:redis$`,
 				`^kube_deployment:redis$`,
 				`^kube_namespace:workload-redis$`,