From a5f7a7f62437561b6ab67f2a79a2fc357945b17c Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Mon, 13 May 2024 16:17:12 +0200 Subject: [PATCH] fix(TestCPU): Mark as flake in the flakes.yaml (#25535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(TestCPU): Mark as flake in the flakes.yaml * Apply suggestions from code review Co-authored-by: Lénaïc Huard --------- Co-authored-by: Lénaïc Huard --- flakes.yaml | 8 ++++++++ test/new-e2e/tests/containers/k8s_test.go | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/flakes.yaml b/flakes.yaml index beedefcb3fa54..d0808c3c5a5a8 100644 --- a/flakes.yaml +++ b/flakes.yaml @@ -6,3 +6,11 @@ # "test/new-e2e/tests/agent-platform/install-script" # - "TestInstallScript/test_install_script_on_centos-79_x86_64_datadog-agent_agent_7" +# TODO: https://datadoghq.atlassian.net/browse/CONTINT-4143 +test/new-e2e/tests/containers: + - TestEKSSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$} + - TestEKSSuite/TestCPU + - TestEKSSuite + - TestKindSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$} + - TestKindSuite/TestCPU + - TestKindSuite diff --git a/test/new-e2e/tests/containers/k8s_test.go b/test/new-e2e/tests/containers/k8s_test.go index f926ad41f1139..9b8ff7dd1b7ff 100644 --- a/test/new-e2e/tests/containers/k8s_test.go +++ b/test/new-e2e/tests/containers/k8s_test.go @@ -15,7 +15,6 @@ import ( "github.com/DataDog/agent-payload/v5/cyclonedx_v1_4" "github.com/DataDog/agent-payload/v5/sbom" "github.com/DataDog/datadog-agent/pkg/util/pointer" - "github.com/DataDog/datadog-agent/pkg/util/testutil/flake" "github.com/DataDog/datadog-agent/test/fakeintake/aggregator" fakeintake "github.com/DataDog/datadog-agent/test/fakeintake/client" "gopkg.in/zorkian/go-datadog-api.v2" @@ -449,8 +448,6 @@ func (suite *k8sSuite) TestRedis() { func (suite *k8sSuite) TestCPU() { // TODO: https://datadoghq.atlassian.net/browse/CONTINT-4143 - flake.Mark(suite.T()) - // Test CPU metrics suite.testMetric(&testMetricArgs{ Filter: testMetricFilterArgs{