From 63a7a38d3966198dade09ffcf5932c872e9ead9a Mon Sep 17 00:00:00 2001 From: kruskal <99559985+kruskall@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:47:35 +0100 Subject: [PATCH] test: bind mount gomodcache to cache go dependencies try to speed up ci jobs integration tests --- dev-tools/mage/integtest_docker.go | 6 ++++++ metricbeat/docker-compose.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/dev-tools/mage/integtest_docker.go b/dev-tools/mage/integtest_docker.go index 8c5fb6d3603f..ccb8f7b5522f 100644 --- a/dev-tools/mage/integtest_docker.go +++ b/dev-tools/mage/integtest_docker.go @@ -449,9 +449,15 @@ func integTestDockerComposeEnvVars() (map[string]string, error) { return nil, err } + goModCache := os.Getenv("GOMODCACHE") + if goModCache == "" { + goModCache = os.Getenv("GOPATH") + "/pkg/mod" + } + return map[string]string{ "ES_BEATS": esBeatsDir, "STACK_ENVIRONMENT": StackEnvironment, + "GOMODCACHE": goModCache, // Deprecated use STACK_ENVIRONMENT instead (it's more descriptive). "TESTING_ENVIRONMENT": StackEnvironment, }, nil diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index 03b48240814b..afcc7ea49d2c 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -11,6 +11,7 @@ services: working_dir: /go/src/github.com/elastic/beats/metricbeat volumes: - ${PWD}/..:/go/src/github.com/elastic/beats/ + - ${GOMODCACHE}:/go/pkg/mod/:ro - /var/run/docker.sock:/var/run/docker.sock network_mode: host command: make