From c9da68cd2da3a299801fcc313411665ace9b1bc1 Mon Sep 17 00:00:00 2001 From: "agent-platform-auto-pr[bot]" <153269286+agent-platform-auto-pr[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:07:40 +0000 Subject: [PATCH 1/2] [test-infra-definitions][automated] Bump test-infra-definitions to 0269b182 --- .gitlab/common/test_infra_version.yml | 2 +- test/new-e2e/go.mod | 2 +- test/new-e2e/go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/common/test_infra_version.yml b/.gitlab/common/test_infra_version.yml index 1db0552f85527..bf7b69c621a14 100644 --- a/.gitlab/common/test_infra_version.yml +++ b/.gitlab/common/test_infra_version.yml @@ -4,4 +4,4 @@ variables: # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" # Make sure to update test-infra-definitions version in go.mod as well - TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0a48ed729822 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0269b182e897 diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index f83c7047329e8..ef09edb9d6e9c 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -60,7 +60,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-20241104134504-0a48ed729822 + github.com/DataDog/test-infra-definitions v0.0.0-20241106134553-0269b182e897 github.com/aws/aws-sdk-go-v2 v1.32.2 github.com/aws/aws-sdk-go-v2/config v1.27.40 github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 45bb210445b15..46b3cc2a6b7aa 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -16,8 +16,8 @@ github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a h1:m9REhmyaWD5YJ0P53ygRHxKKo+KM+nw+zz0hEdKztMo= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= -github.com/DataDog/test-infra-definitions v0.0.0-20241104134504-0a48ed729822 h1:bftFzcjeK8zyScbXP8+ifHfRCPQb14xHy3JD0ogVwmo= -github.com/DataDog/test-infra-definitions v0.0.0-20241104134504-0a48ed729822/go.mod h1:l0n0FQYdWWQxbI5a2EkuynRQIteUQcYOaOhdxD9TvJs= +github.com/DataDog/test-infra-definitions v0.0.0-20241106134553-0269b182e897 h1:yCbhLaf+xQq6hCVzQQEPI8fOhff+uIYIAdPiKXKhaW4= +github.com/DataDog/test-infra-definitions v0.0.0-20241106134553-0269b182e897/go.mod h1:l0n0FQYdWWQxbI5a2EkuynRQIteUQcYOaOhdxD9TvJs= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= From 2572ea56f785d15c40b3a562ce24bbd6a3f66e67 Mon Sep 17 00:00:00 2001 From: pducolin Date: Thu, 7 Nov 2024 10:24:04 +0100 Subject: [PATCH 2/2] [e2e] use FedoraDefault version in installer test --- test/new-e2e/tests/installer/unix/all_packages_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/new-e2e/tests/installer/unix/all_packages_test.go b/test/new-e2e/tests/installer/unix/all_packages_test.go index 2c7c1a5f8d340..075668a50a3b4 100644 --- a/test/new-e2e/tests/installer/unix/all_packages_test.go +++ b/test/new-e2e/tests/installer/unix/all_packages_test.go @@ -39,7 +39,7 @@ var ( e2eos.AmazonLinux2, e2eos.Debian12, e2eos.RedHat9, - e2eos.Fedora37, + e2eos.FedoraDefault, e2eos.CentOS7, e2eos.Suse15, } @@ -51,7 +51,7 @@ var ( packagesTestsWithSkippedFlavors = []packageTestsWithSkipedFlavors{ {t: testInstaller}, {t: testAgent}, - {t: testApmInjectAgent, skippedFlavors: []e2eos.Descriptor{e2eos.CentOS7, e2eos.RedHat9, e2eos.Fedora37, e2eos.Suse15}, skippedInstallationMethods: []InstallMethodOption{InstallMethodAnsible}}, + {t: testApmInjectAgent, skippedFlavors: []e2eos.Descriptor{e2eos.CentOS7, e2eos.RedHat9, e2eos.FedoraDefault, e2eos.Suse15}, skippedInstallationMethods: []InstallMethodOption{InstallMethodAnsible}}, {t: testUpgradeScenario}, } )