Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable all e2e tests that require elastic-agent #3293

Merged
merged 5 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ e2e-docker-stop: ## - Tear down testing Elasticsearch and Kibana instances
@$(MAKE) int-docker-stop

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

##################################################
# Cloud testing targets
Expand Down
14 changes: 4 additions & 10 deletions testing/e2e/agent_container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

//go:build e2e
// FIXME(ml): test suite is disabled by additional build flag.
// we do not want to rely on agent builds in our pipeline.

//go:build e2e && ignore

package e2e

Expand All @@ -20,15 +23,6 @@ import (
"github.com/testcontainers/testcontainers-go"
)

type logger struct {
*testing.T
}

func (l *logger) Printf(format string, v ...interface{}) {
l.Helper()
l.Logf(format, v...)
}

type AgentContainerSuite struct {
scaffold.Scaffold

Expand Down
4 changes: 1 addition & 3 deletions testing/e2e/agent_install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
// you may not use this file except in compliance with the Elastic License.

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

//go:build e2e && ignore

Expand Down
9 changes: 9 additions & 0 deletions testing/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ import (
"github.com/testcontainers/testcontainers-go/wait"
)

type logger struct {
*testing.T
}

func (l *logger) Printf(format string, v ...interface{}) {
l.Helper()
l.Logf(format, v...)
}

var longFlag bool

func init() {
Expand Down
Loading