diff --git a/testing/benchmark/variables.tf b/testing/benchmark/variables.tf index deb2d05d6b0..577ef373ac6 100644 --- a/testing/benchmark/variables.tf +++ b/testing/benchmark/variables.tf @@ -20,7 +20,8 @@ variable "deployment_template" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string } diff --git a/testing/cloud/variables.tf b/testing/cloud/variables.tf index fafb0c716c9..53c58d293ae 100644 --- a/testing/cloud/variables.tf +++ b/testing/cloud/variables.tf @@ -13,7 +13,8 @@ variable "deployment_template" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string } diff --git a/testing/infra/terraform/modules/ec_deployment/variables.tf b/testing/infra/terraform/modules/ec_deployment/variables.tf index 1a0f67932e7..f4401ea00cc 100644 --- a/testing/infra/terraform/modules/ec_deployment/variables.tf +++ b/testing/infra/terraform/modules/ec_deployment/variables.tf @@ -19,7 +19,8 @@ variable "deployment_template" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string } diff --git a/testing/infra/terraform/modules/standalone_apm_server/variables.tf b/testing/infra/terraform/modules/standalone_apm_server/variables.tf index d0e11890832..f642a25b10a 100644 --- a/testing/infra/terraform/modules/standalone_apm_server/variables.tf +++ b/testing/infra/terraform/modules/standalone_apm_server/variables.tf @@ -28,7 +28,8 @@ variable "elasticsearch_password" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string } diff --git a/testing/rally-cloud/variables.tf b/testing/rally-cloud/variables.tf index 49517b124d2..35bbc52e448 100644 --- a/testing/rally-cloud/variables.tf +++ b/testing/rally-cloud/variables.tf @@ -11,9 +11,10 @@ variable "deployment_template" { } variable "stack_version" { + # Use the latest 8 version until 9 is ready. + default = "8.?.?" type = string description = "Optional stack version" - default = "latest" } variable "elasticsearch_size" { diff --git a/testing/smoke/lib.sh b/testing/smoke/lib.sh index 12cd241e9f0..78d85b581bd 100644 --- a/testing/smoke/lib.sh +++ b/testing/smoke/lib.sh @@ -41,7 +41,8 @@ get_latest_snapshot() { if [ $RC -ne 0 ]; then echo "${RES}"; fi # NOTE: semver with SNAPSHOT is not working when using the sort_by function in jq, # that's the reason for transforming the SNAPSHOT in a semver 4 digits. - VERSIONS=$(echo "${RES}" | jq -r -c '[.stacks[].version | select(. | contains("-SNAPSHOT"))] | sort' | sed 's#-SNAPSHOT#.0#g' | jq -r -c ' sort_by(.| split(".") | map(tonumber))' | sed 's#.0"#-SNAPSHOT"#g' | jq -r -c .) + # Filter out 9.0.0 temporarily until it's ready. + VERSIONS=$(echo "${RES}" | jq -r -c '[.stacks[].version | select(. | startswith("9.0.0") | not) | select(. | contains("-SNAPSHOT"))] | sort' | sed 's#-SNAPSHOT#.0#g' | jq -r -c ' sort_by(.| split(".") | map(tonumber))' | sed 's#.0"#-SNAPSHOT"#g' | jq -r -c .) } get_latest_snapshot_for_version() { diff --git a/testing/smoke/managed/main.tf b/testing/smoke/managed/main.tf index 3fead67e50e..a5d6fd35a28 100644 --- a/testing/smoke/managed/main.tf +++ b/testing/smoke/managed/main.tf @@ -77,7 +77,8 @@ variable "aws_provisioner_key_name" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string } diff --git a/testing/smoke/supported-os/main.tf b/testing/smoke/supported-os/main.tf index 9674b1829ba..a5d6149ca49 100644 --- a/testing/smoke/supported-os/main.tf +++ b/testing/smoke/supported-os/main.tf @@ -77,7 +77,8 @@ variable "aws_provisioner_key_name" { } variable "stack_version" { - default = "latest" + # Use the latest 8 version until 9 is ready. + default = "8.?.?" description = "Optional stack version" type = string }