From 414ac886707649c15640fcada568c6b9a99d6cd1 Mon Sep 17 00:00:00 2001 From: "agent-platform-auto-pr[bot]" <153269286+agent-platform-auto-pr[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:15:54 +0000 Subject: [PATCH 1/3] [test-infra-definitions][automated] Bump test-infra-definitions to 7e55b9e3 --- .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 31e364287c40c..fdd381dca9893 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: 08b9d8e048c1 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: 7e55b9e3279a diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 496ee8b6854c3..049237402b26b 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -59,7 +59,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-20241007132100-08b9d8e048c1 + github.com/DataDog/test-infra-definitions v0.0.0-20241010155348-7e55b9e3279a github.com/aws/aws-sdk-go-v2 v1.32.0 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 4567e90b8819f..1337926e5b24b 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-20241007132100-08b9d8e048c1 h1:vQFrWWJ8BUWqHpkUP4bu81ZVsk/2vPsykdiilL5LJCk= -github.com/DataDog/test-infra-definitions v0.0.0-20241007132100-08b9d8e048c1/go.mod h1:spBV6LBmaH17vb/oe6n2kVfsuEUR+eQGsoaCGJclHF0= +github.com/DataDog/test-infra-definitions v0.0.0-20241010155348-7e55b9e3279a h1:pUK99AnBBTVtAX5T+haaLftyjf0BIkFHTJHmAyE+fZI= +github.com/DataDog/test-infra-definitions v0.0.0-20241010155348-7e55b9e3279a/go.mod h1:spBV6LBmaH17vb/oe6n2kVfsuEUR+eQGsoaCGJclHF0= github.com/DataDog/viper v1.13.5 h1:SZMcyMknYQN2jRY/40A16gUXexlNJOI8sDs1cWZnI64= github.com/DataDog/viper v1.13.5/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= From 13db101726eb413dac91e28a4d97932f7fbac719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Julia=CC=81n?= Date: Thu, 10 Oct 2024 10:04:07 +0200 Subject: [PATCH 2/3] Update platforms --- .../system-probe/config/platforms.json | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/test/new-e2e/system-probe/config/platforms.json b/test/new-e2e/system-probe/config/platforms.json index 9397bb69e396d..b7a95fb5f7e26 100644 --- a/test/new-e2e/system-probe/config/platforms.json +++ b/test/new-e2e/system-probe/config/platforms.json @@ -7,7 +7,7 @@ "kernel": "6.0.7-301.fc37", "os_version": "37", "image": "Fedora-Cloud-Base-37.x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "fedora_38": { "os_name": "Fedora Linux", @@ -15,7 +15,7 @@ "kernel": "6.2.9-300.fc38", "os_version": "38", "image": "Fedora-Cloud-Base-38.x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_4.14": { "os_name": "Amazon Linux", @@ -23,23 +23,23 @@ "kernel": "4.14.314-237.533.amzn2", "os_version": "2", "image": "amzn2-x86_64-4.14.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_5.10": { "os_name": "Amazon Linux", "os_id": "amzn", - "kernel": "5.10.219-208.866.amzn2", + "kernel": "5.10.226-214.879.amzn2", "os_version": "2", "image": "amzn2-x86_64-5.10.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_5.4": { "os_name": "Amazon Linux", "os_id": "amzn", - "kernel": "5.4.277-190.375.amzn2", + "kernel": "5.4.284-196.380.amzn2", "os_version": "2", "image": "amzn2-x86_64-5.4.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_2023": { "os_name": "Amazon Linux", @@ -47,7 +47,7 @@ "kernel": "6.1.77-99.164.amzn2023", "os_version": "2023", "image": "amzn2023-amd64-2023.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "centos_7.9": { "os_name": "CentOS Linux", @@ -55,7 +55,7 @@ "kernel": "3.10.0-1160.80.1.el7", "os_version": "7.9.2009", "image": "centos-7.9-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "centos_8": { "os_name": "CentOS Stream", @@ -63,15 +63,15 @@ "kernel": "4.18.0-552.3.1.el8", "os_version": "8", "image": "centos-8-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "debian_10": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "4.19.0-26", + "kernel": "4.19.0-27", "os_version": "10", "image": "debian-10-generic-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "buster" ] @@ -79,10 +79,10 @@ "debian_11": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "5.10.0-28", + "kernel": "5.10.0-32", "os_version": "11", "image": "debian-11-generic-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bullseye" ] @@ -90,10 +90,10 @@ "debian_12": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "6.1.0-18", + "kernel": "6.1.0-25", "os_version": "12", "image": "debian-12-generic-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bookworm" ] @@ -104,7 +104,7 @@ "kernel": "3.10.0-1160.105.1.0.1.el7", "os_version": "7.9", "image": "oracle-7.9-x86_64.qcow.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "oracle_8.9": { "os_name": "Oracle Linux Server", @@ -112,7 +112,7 @@ "kernel": "5.15.0-200.131.27.el8uek", "os_version": "8.9", "image": "oracle-8.9-x86_64.qcow.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "oracle_9.3": { "os_name": "Oracle Linux Server", @@ -120,7 +120,7 @@ "kernel": "5.15.0-200.131.27.el9uek", "os_version": "9.3", "image": "oracle-9.3-x86_64.qcow.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "rocky_8.5": { "os_name": "Rocky Linux", @@ -128,7 +128,7 @@ "kernel": "4.18.0-348.el8.0.2", "os_version": "8.5", "image": "rocky-8.5-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "rocky_9.3": { "os_name": "Rocky Linux", @@ -136,7 +136,7 @@ "kernel": "5.14.0-362.8.1.el9_3", "os_version": "9.3", "image": "rocky-9.3-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "ubuntu_16.04": { "os_name": "Ubuntu", @@ -144,7 +144,7 @@ "kernel": "4.4.0-210-generic", "os_version": "16.04", "image": "ubuntu-16.04-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "xenial" ] @@ -155,7 +155,7 @@ "kernel": "4.18.0-25-generic", "os_version": "18.04", "image": "ubuntu-18.04-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bionic" ] @@ -166,7 +166,7 @@ "kernel": "5.4.0-167-generic", "os_version": "20.04", "image": "ubuntu-20.04-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "focal" ] @@ -177,7 +177,7 @@ "kernel": "5.15.0-91-generic", "os_version": "22.04", "image": "ubuntu-22.04-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "jammy" ] @@ -185,10 +185,10 @@ "ubuntu_23.10": { "os_name": "Ubuntu", "os_id": "ubuntu", - "kernel": "6.5.0-9-generic", + "kernel": "6.5.0-44-generic", "os_version": "23.10", "image": "ubuntu-23.10-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "mantic" ] @@ -199,7 +199,7 @@ "kernel": "6.8.0-31-generic", "os_version": "24.04", "image": "ubuntu-24.04-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "noble" ] @@ -210,23 +210,23 @@ "kernel": "5.3.18-150300.59.106.1", "os_version": "15.3", "image": "opensuse-15.3-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "opensuse_15.5": { "os_name": "openSUSE Leap", "os_id": "opensuse-leap", - "kernel": "5.14.21-150500.55.68.1", + "kernel": "5.14.21-150500.55.80.2", "os_version": "15.5", "image": "opensuse-15.5-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "suse_12.5": { "os_name": "SLES", "os_id": "sles", - "kernel": "4.12.14-122.219.1", + "kernel": "4.12.14-122.228.1", "os_version": "12.5", "image": "suse-12.5-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "debian_9": { "os_name": "Debian GNU/Linux", @@ -234,7 +234,7 @@ "kernel": "4.9.0-19", "os_version": "9", "image": "debian-9-generic-x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "stretch" ] @@ -245,7 +245,7 @@ "kernel": "6.8.5-301.fc40", "os_version": "40", "image": "Fedora-Cloud-Base-40.x86_64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" } }, "arm64": { @@ -255,7 +255,7 @@ "kernel": "6.0.7-301.fc37", "os_version": "37", "image": "Fedora-Cloud-Base-37.arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "fedora_38": { "os_name": "Fedora Linux", @@ -263,7 +263,7 @@ "kernel": "6.2.9-300.fc38", "os_version": "38", "image": "Fedora-Cloud-Base-38.arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_4.14": { "os_name": "Amazon Linux", @@ -271,15 +271,15 @@ "kernel": "4.14.314-237.533.amzn2", "os_version": "2", "image": "amzn2-arm64-4.14.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_5.4": { "os_name": "Amazon Linux", "os_id": "amzn", - "kernel": "5.4.277-190.375.amzn2", + "kernel": "5.4.284-196.380.amzn2", "os_version": "2", "image": "amzn2-arm64-5.4.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "centos_7.9": { "os_name": "CentOS Linux", @@ -287,7 +287,7 @@ "kernel": "4.18.0-348.20.1.el7", "os_version": "7.9.2009", "image": "centos-7.9-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "centos_8": { "os_name": "CentOS Stream", @@ -295,15 +295,15 @@ "kernel": "4.18.0-552.3.1.el8", "os_version": "8", "image": "centos-8-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "debian_10": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "4.19.0-26", + "kernel": "4.19.0-27", "os_version": "10", "image": "debian-10-generic-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "buster" ] @@ -311,10 +311,10 @@ "debian_11": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "5.10.0-28", + "kernel": "5.10.0-32", "os_version": "11", "image": "debian-11-generic-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bullseye" ] @@ -322,10 +322,10 @@ "debian_12": { "os_name": "Debian GNU/Linux", "os_id": "debian", - "kernel": "6.1.0-18", + "kernel": "6.1.0-25", "os_version": "12", "image": "debian-12-generic-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bookworm" ] @@ -336,7 +336,7 @@ "kernel": "5.15.0-200.131.27.el8uek", "os_version": "8.9", "image": "oracle-8.9-arm64.qcow.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "oracle_9.3": { "os_name": "Oracle Linux Server", @@ -344,7 +344,7 @@ "kernel": "5.15.0-200.131.27.el9uek", "os_version": "9.3", "image": "oracle-9.3-arm64.qcow.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "rocky_8.5": { "os_name": "Rocky Linux", @@ -352,7 +352,7 @@ "kernel": "4.18.0-348.el8.0.2", "os_version": "8.5", "image": "rocky-8.5-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "rocky_9.3": { "os_name": "Rocky Linux", @@ -360,15 +360,15 @@ "kernel": "5.14.0-362.8.1.el9_3", "os_version": "9.3", "image": "rocky-9.3-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_5.10": { "os_name": "Amazon Linux", "os_id": "amzn", - "kernel": "5.10.219-208.866.amzn2", + "kernel": "5.10.226-214.879.amzn2", "os_version": "2", "image": "amzn2-arm64-5.10.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "amazon_2023": { "os_name": "Amazon Linux", @@ -376,7 +376,7 @@ "kernel": "6.1.77-99.164.amzn2023", "os_version": "2023", "image": "amzn2023-arm64-2023.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "ubuntu_18.04": { "os_name": "Ubuntu", @@ -384,7 +384,7 @@ "kernel": "4.18.0-25-generic", "os_version": "18.04", "image": "ubuntu-18.04-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "bionic" ] @@ -395,7 +395,7 @@ "kernel": "5.4.0-167-generic", "os_version": "20.04", "image": "ubuntu-20.04-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "focal" ] @@ -406,7 +406,7 @@ "kernel": "5.15.0-91-generic", "os_version": "22.04", "image": "ubuntu-22.04-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "jammy" ] @@ -414,10 +414,10 @@ "ubuntu_23.10": { "os_name": "Ubuntu", "os_id": "ubuntu", - "kernel": "6.5.0-9-generic", + "kernel": "6.5.0-44-generic", "os_version": "23.10", "image": "ubuntu-23.10-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "mantic" ] @@ -428,7 +428,7 @@ "kernel": "6.8.0-31-generic", "os_version": "24.04", "image": "ubuntu-24.04-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99", + "image_version": "20241003_a9a46356", "alt_version_names": [ "noble" ] @@ -439,23 +439,23 @@ "kernel": "5.3.18-150300.59.106.1", "os_version": "15.3", "image": "opensuse-15.3-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "opensuse_15.5": { "os_name": "openSUSE Leap", "os_id": "opensuse-leap", - "kernel": "5.14.21-150500.55.68.1", + "kernel": "5.14.21-150500.55.80.2", "os_version": "15.5", "image": "opensuse-15.5-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "suse_12.5": { "os_name": "SLES", "os_id": "sles", - "kernel": "4.12.14-122.219.1", + "kernel": "4.12.14-122.228.1", "os_version": "12.5", "image": "suse-12.5-arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" }, "fedora_40": { "os_name": "Fedora Linux", @@ -463,7 +463,7 @@ "kernel": "6.8.5-301.fc40", "os_version": "40", "image": "Fedora-Cloud-Base-40.arm64.qcow2.xz", - "image_version": "20240710_cd40ed99" + "image_version": "20241003_a9a46356" } } } \ No newline at end of file From d881dbfe47ffb0fef730ec3cab09f3e7c74e6bce Mon Sep 17 00:00:00 2001 From: pducolin Date: Thu, 10 Oct 2024 18:33:14 +0200 Subject: [PATCH 3/3] [e2e][ecs] import cluster name from exported component --- test/new-e2e/tests/containers/ecs_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/new-e2e/tests/containers/ecs_test.go b/test/new-e2e/tests/containers/ecs_test.go index 55c4dd15f12b4..42d3f6a40c7e1 100644 --- a/test/new-e2e/tests/containers/ecs_test.go +++ b/test/new-e2e/tests/containers/ecs_test.go @@ -13,6 +13,7 @@ import ( "testing" "time" + ecsComp "github.com/DataDog/test-infra-definitions/components/ecs" "github.com/DataDog/test-infra-definitions/scenarios/aws/ecs" "github.com/DataDog/datadog-agent/pkg/util/pointer" @@ -77,7 +78,12 @@ func (suite *ecsSuite) SetupSuite() { suite.Require().NoError(fakeintake.Init(suite)) suite.Fakeintake = fakeintake.Client() - suite.ecsClusterName = stackOutput.Outputs["ecs-cluster-name"].Value.(string) + clusterSerialized, err := json.Marshal(stackOutput.Outputs["dd-Cluster-ecs-cluster"].Value) + suite.Require().NoError(err) + ecsCluster := &ecsComp.ClusterOutput{} + suite.Require().NoError(ecsCluster.Import(clusterSerialized, ecsCluster)) + + suite.ecsClusterName = ecsCluster.ClusterName suite.clusterName = suite.ecsClusterName suite.baseSuite.SetupSuite()