Skip to content

Commit 626a422

Browse files
Disable all e2e tests that require elastic-agent
1 parent a340844 commit 626a422

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ e2e-docker-stop: ## - Tear down testing Elasticsearch and Kibana instances
366366
@$(MAKE) int-docker-stop
367367

368368
.PHONY: test-e2e
369-
test-e2e: docker-cover-e2e-binaries build-e2e-agent-image e2e-certs build-docker ## - Setup and run the blackbox end to end test suite
369+
test-e2e: docker-cover-e2e-binaries e2e-certs build-docker ## - Setup and run the blackbox end to end test suite
370370
@mkdir -p build/e2e-cover
371371
@$(MAKE) e2e-docker-start
372372
@set -o pipefail; $(MAKE) test-e2e-set | tee build/test-e2e.out
@@ -381,7 +381,7 @@ test-e2e-set: ## - Run the blackbox end to end tests without setup.
381381
AGENT_E2E_IMAGE=$(shell cat "build/e2e-image") \
382382
STANDALONE_E2E_IMAGE=$(DOCKER_IMAGE):$(DOCKER_IMAGE_TAG)$(if $(DEV),-dev,) \
383383
CGO_ENABLED=1 \
384-
go test -v -timeout 30m -tags=e2e -count=1 -race -p 1 ./... -run StandAlone
384+
go test -v -timeout 30m -tags=e2e -count=1 -race -p 1 ./...
385385

386386
##################################################
387387
# Cloud testing targets

testing/e2e/agent_container_test.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
// or more contributor license agreements. Licensed under the Elastic License;
33
// you may not use this file except in compliance with the Elastic License.
44

5-
//go:build e2e
5+
// FIXME(ml): test suite is disabled by additional build flag.
6+
// we do not want to rely on agent builds in our pipeline.
7+
8+
//go:build e2e && ignore
69

710
package e2e
811

@@ -20,15 +23,6 @@ import (
2023
"github.com/testcontainers/testcontainers-go"
2124
)
2225

23-
type logger struct {
24-
*testing.T
25-
}
26-
27-
func (l *logger) Printf(format string, v ...interface{}) {
28-
l.Helper()
29-
l.Logf(format, v...)
30-
}
31-
3226
type AgentContainerSuite struct {
3327
scaffold.Scaffold
3428

testing/e2e/agent_install_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
// you may not use this file except in compliance with the Elastic License.
44

55
// FIXME(ml): test suite is disabled by additional build flag.
6-
// I've had issues getting the test to run in Jenkins (lack of tty).
7-
// And there also seem to be issues with uninstalling the agent after each test when running in a VM.
8-
// We should fix this once we have migrated to buildkite.
6+
// we do not want to rely on agent builds in our pipeline.
97

108
//go:build e2e && ignore
119

testing/e2e/e2e_test.go

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ import (
1616
"github.com/testcontainers/testcontainers-go/wait"
1717
)
1818

19+
type logger struct {
20+
*testing.T
21+
}
22+
23+
func (l *logger) Printf(format string, v ...interface{}) {
24+
l.Helper()
25+
l.Logf(format, v...)
26+
}
27+
1928
var longFlag bool
2029

2130
func init() {

0 commit comments

Comments
 (0)