Skip to content

Commit b72a64f

Browse files
authored
test: fix failing smoke tests (#400)
* test: update smoketest/run to depend on the correct task fix file not found * test: update to gcp-compute-optimized-v3 * test: use 1gb elasticsearch with 1 zone the lambda extension is just sending a couple of requests, there's no need to use a 8g instance. This saves a bit more than 1m when running smoke tests
1 parent 9c21dba commit b72a64f

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ smoketest/discover:
6868
@echo "$(SMOKETEST_DIRS)"
6969

7070
.PHONY: smoketest/run
71-
smoketest/run: build
71+
smoketest/run: zip
7272
@ for version in $(shell echo $(SMOKETEST_VERSIONS) | tr ',' ' '); do \
7373
echo "-> Running $(TEST_DIR) smoke tests for version $${version}..."; \
7474
cd $(TEST_DIR) && ./test.sh $${version}; \

testing/benchmarking/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ variable "ess_region" {
6060
variable "deployment_template" {
6161
type = string
6262
description = "Optional deployment template. Defaults to the CPU optimized template for GCP"
63-
default = "gcp-compute-optimized-v2"
63+
default = "gcp-compute-optimized-v3"
6464
}
6565

6666
variable "stack_version" {

tf/main.tf

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ module "tags" {
1111
}
1212

1313
module "ec_deployment" {
14-
source = "github.com/elastic/apm-server//testing/infra/terraform/modules/ec_deployment?depth=1"
15-
deployment_name_prefix = "apm-aws-lambda-smoke-testing"
16-
integrations_server = true
17-
apm_server_expvar = false
18-
apm_server_pprof = false
19-
region = var.ess_region
20-
deployment_template = var.ess_deployment_template
21-
stack_version = var.ess_version
22-
tags = module.tags.tags
14+
source = "github.com/elastic/apm-server//testing/infra/terraform/modules/ec_deployment?depth=1"
15+
deployment_name_prefix = "apm-aws-lambda-smoke-testing"
16+
integrations_server = true
17+
elasticsearch_size = "1g"
18+
elasticsearch_zone_count = 1
19+
apm_server_expvar = false
20+
apm_server_pprof = false
21+
region = var.ess_region
22+
deployment_template = var.ess_deployment_template
23+
stack_version = var.ess_version
24+
tags = module.tags.tags
2325
}
2426

2527
data "aws_iam_policy_document" "assume_role" {

tf/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ variable "ess_region" {
2424
variable "ess_deployment_template" {
2525
type = string
2626
description = "Elastic Cloud deployment template"
27-
default = "gcp-compute-optimized"
27+
default = "gcp-compute-optimized-v3"
2828
}
2929

3030
variable "ess_version" {

0 commit comments

Comments
 (0)