rename files, use new-e2e dev module

DataDog · Dec 27, 2024 · 9e3e530 · 9e3e530
1 parent 0c3c3a0
commit 9e3e530
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -210,7 +210,9 @@ integration-tests-v2: $(ENVTEST) ## Run tests with reconciler V2
 
 .PHONY: e2e-tests
 e2e-tests: manifests $(KUSTOMIZE) ## Run E2E tests and destroy environment stacks after tests complete. To run locally, complete pre-reqs (see docs/how-to-contribute.md) and prepend command with `aws-vault exec sso-agent-sandbox-account-admin --`. E.g. `aws-vault exec sso-agent-sandbox-account-admin -- make e2e-tests`.
-	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e github.com/DataDog/datadog-operator/test/e2e -run TestAWSKindSuite -count=1 -v -timeout 1h -coverprofile cover_e2e.out
+	cd test/e2e && go get github.com/DataDog/datadog-agent/test/new-e2e@1cc7604f4b6b35a230b3dc1226d35b86034a832a
+	cd $(ROOT)
+	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test -C test/e2e ./... --tags=!e2e github.com/DataDog/datadog-operator/test/e2e -run TestLocalKindSuite -count=1 -v -timeout 1h -coverprofile cover_e2e.out
 
 .PHONY: e2e-tests-keep-stacks
 e2e-tests-keep-stacks: manifests $(KUSTOMIZE) ## Run E2E tests and keep environment stacks running. To run locally, complete pre-reqs (see docs/how-to-contribute.md) and prepend command with `aws-vault exec sso-agent-sandbox-account-admin --`. E.g. `aws-vault exec sso-agent-sandbox-account-admin -- make e2e-tests-keep-stacks`.

diff --git a/go.work.sum b/go.work.sum
diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -3,6 +3,9 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//go:build e2e
+// +build e2e
+
 package e2e
 
 import (

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -3,14 +3,14 @@ module github.com/DataDog/datadog-operator/test/e2e
 go 1.23.0
 
 replace (
-	github.com/DataDog/datadog-agent/comp/core/tagger/types => github.com/DataDog/datadog-agent/comp/core/tagger/types v0.63.0-devel.0.20241227161138-ebe3db6f6c5c
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/dev =>  github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/dev v0.63.0-devel.0.20241227161138-ebe3db6f6c5c
-	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.63.0-devel.0.20241227161138-ebe3db6f6c5c
+	github.com/DataDog/datadog-agent/comp/core/tagger/types => github.com/DataDog/datadog-agent/comp/core/tagger/types v0.60.1
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.60.1
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/dev => github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/dev v0.60.1
 )
 
 require (
 	github.com/DataDog/datadog-agent/test/fakeintake v0.60.1
-	github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227161138-ebe3db6f6c5c
+	github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227180618-1cc7604f4b6b
 	github.com/DataDog/datadog-api-client-go/v2 v2.33.0
 	github.com/DataDog/datadog-operator v1.10.0
 	github.com/DataDog/test-infra-definitions v0.0.0-20241224112147-36860d3c29b4

diff --git a/test/e2e/go.sum b/test/e2e/go.sum
@@ -33,6 +33,8 @@ github.com/DataDog/datadog-agent/test/new-e2e v0.62.0-devel.0.20241227002302-42c
 github.com/DataDog/datadog-agent/test/new-e2e v0.62.0-devel.0.20241227002302-42c23d74802f/go.mod h1:nUsWITGelMKeObSoAxGGnMRnK8SRUO0Labjyfkc3GM0=
 github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227161138-ebe3db6f6c5c h1:82iimn023QZWl0eaw6z9wOpgLCx663ArZDWNc1abRH4=
 github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227161138-ebe3db6f6c5c/go.mod h1:FCHUhMazeYD7cW5r/YXw6Zjeul+LlzL18YD9D9utT9g=
+github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227180618-1cc7604f4b6b h1:TXLJ36xblbLf/01RDUkW7m90ydO6rxxk1ci4925RoxM=
+github.com/DataDog/datadog-agent/test/new-e2e v0.63.0-devel.0.20241227180618-1cc7604f4b6b/go.mod h1:FCHUhMazeYD7cW5r/YXw6Zjeul+LlzL18YD9D9utT9g=
 github.com/DataDog/datadog-api-client-go/v2 v2.33.0 h1:OI6kDnJeQmkjfGzxmP0XUQUxMD4tp6oAPXnnJ4VpgUM=
 github.com/DataDog/datadog-api-client-go/v2 v2.33.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U=
 github.com/DataDog/datadog-operator v1.10.0 h1:P7D/IPKXGftQU1h4CAKEetwCyOXEYAULaPEigf/sHOI=

diff --git a/test/e2e/tests/k8sSuite/k8sSuite_test.go → test/e2e/tests/k8s_suite/k8s_suite_test.go b/test/e2e/tests/k8sSuite/k8sSuite_test.go → test/e2e/tests/k8s_suite/k8s_suite_test.go
diff --git a/test/e2e/tests/k8sSuite/kind_aws_test.go → test/e2e/tests/k8s_suite/kind_aws_test.go b/test/e2e/tests/k8sSuite/kind_aws_test.go → test/e2e/tests/k8s_suite/kind_aws_test.go
diff --git a/test/e2e/tests/k8sSuite/kind_local_test.go → test/e2e/tests/k8s_suite/kind_local_test.go b/test/e2e/tests/k8sSuite/kind_local_test.go → test/e2e/tests/k8s_suite/kind_local_test.go