diff --git a/.gitlab/common/test_infra_version.yml b/.gitlab/common/test_infra_version.yml index 287eb33b6df26..5148780552267 100644 --- a/.gitlab/common/test_infra_version.yml +++ b/.gitlab/common/test_infra_version.yml @@ -5,5 +5,5 @@ --- variables: - TEST_INFRA_DEFINITIONS_BUILDIMAGES: 93e0ad6d6460 - TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: '' + TEST_INFRA_DEFINITIONS_BUILDIMAGES: 7dd3747e4e68 + TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: '-dev' diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 4836dccf4a074..d7f784286f19a 100644 --- a/test/new-e2e/go.mod +++ b/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-20250221150201-93e0ad6d6460 + github.com/DataDog/test-infra-definitions v0.0.0-20250226194045-7dd3747e4e68 github.com/aws/aws-sdk-go-v2 v1.36.1 github.com/aws/aws-sdk-go-v2/config v1.29.6 github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.0 diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index fdfef1cbff2f6..1e282bc79ddca 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -14,8 +14,8 @@ github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEU github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= -github.com/DataDog/test-infra-definitions v0.0.0-20250221150201-93e0ad6d6460 h1:J2OXmToh5FTT0qm2GGACWRjEFeU2MfZQqBC1FJWaJFg= -github.com/DataDog/test-infra-definitions v0.0.0-20250221150201-93e0ad6d6460/go.mod h1:l+XwYwMuZpin+jhQQZAumCaeqZAz/6b7CJ+8bBmWXYU= +github.com/DataDog/test-infra-definitions v0.0.0-20250226194045-7dd3747e4e68 h1:MCIFDDV6rL79Xd8DeG/eLHfk8XK9SFy6lwE3PER1yTY= +github.com/DataDog/test-infra-definitions v0.0.0-20250226194045-7dd3747e4e68/go.mod h1:l+XwYwMuZpin+jhQQZAumCaeqZAz/6b7CJ+8bBmWXYU= github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= diff --git a/test/new-e2e/tests/containers/k8s_test.go b/test/new-e2e/tests/containers/k8s_test.go index ba321b8cf1d5b..a77469a5c8a56 100644 --- a/test/new-e2e/tests/containers/k8s_test.go +++ b/test/new-e2e/tests/containers/k8s_test.go @@ -504,6 +504,8 @@ func (suite *k8sSuite) TestNginx() { `^team:contp$`, `^mail:team-container-platform@datadoghq.com$`, `^sub-team:contint$`, + `^kube_instance_tag:static$`, + `^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`, }, Value: &testMetricExpectValueArgs{ Max: 5, @@ -600,6 +602,8 @@ func (suite *k8sSuite) TestRedis() { `^kube_cluster_name:`, `^kube_deployment:redis$`, `^kube_namespace:workload-redis$`, + `^kube_instance_tag:static$`, + `^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`, }, Value: &testMetricExpectValueArgs{ Max: 5, @@ -810,6 +814,8 @@ func (suite *k8sSuite) TestKSM() { `^org:agent-org$`, `^team:contp$`, `^mail:team-container-platform@datadoghq.com$`, + `^kube_instance_tag:static$`, + `^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`, }, Value: &testMetricExpectValueArgs{ Max: 1, @@ -830,6 +836,8 @@ func (suite *k8sSuite) TestKSM() { Tags: &[]string{ `^kube_cluster_name:` + regexp.QuoteMeta(suite.clusterName) + `$`, `^kube_namespace:workload-redis$`, + `^kube_instance_tag:static$`, + `^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`, }, Value: &testMetricExpectValueArgs{ Max: 1, @@ -851,6 +859,8 @@ func (suite *k8sSuite) TestKSM() { `^cr_type:ddm$`, `^ddm_namespace:workload-(?:nginx|redis)$`, `^ddm_name:(?:nginx|redis)$`, + `^kube_instance_tag:static$`, + `^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`, }, }, })