File tree 4 files changed +16
-15
lines changed
4 files changed +16
-15
lines changed Original file line number Diff line number Diff line change @@ -366,7 +366,7 @@ e2e-docker-stop: ## - Tear down testing Elasticsearch and Kibana instances
366
366
@$(MAKE ) int-docker-stop
367
367
368
368
.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
370
370
@mkdir -p build/e2e-cover
371
371
@$(MAKE ) e2e-docker-start
372
372
@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.
381
381
AGENT_E2E_IMAGE=$(shell cat "build/e2e-image") \
382
382
STANDALONE_E2E_IMAGE=$(DOCKER_IMAGE ) :$(DOCKER_IMAGE_TAG )$(if $(DEV ) ,-dev,) \
383
383
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 ./...
385
385
386
386
# #################################################
387
387
# Cloud testing targets
Original file line number Diff line number Diff line change 2
2
// or more contributor license agreements. Licensed under the Elastic License;
3
3
// you may not use this file except in compliance with the Elastic License.
4
4
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
6
9
7
10
package e2e
8
11
@@ -20,15 +23,6 @@ import (
20
23
"github.com/testcontainers/testcontainers-go"
21
24
)
22
25
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
-
32
26
type AgentContainerSuite struct {
33
27
scaffold.Scaffold
34
28
Original file line number Diff line number Diff line change 3
3
// you may not use this file except in compliance with the Elastic License.
4
4
5
5
// 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.
9
7
10
8
//go:build e2e && ignore
11
9
Original file line number Diff line number Diff line change @@ -16,6 +16,15 @@ import (
16
16
"github.com/testcontainers/testcontainers-go/wait"
17
17
)
18
18
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
+
19
28
var longFlag bool
20
29
21
30
func init () {
You can’t perform that action at this time.
0 commit comments