Skip to content

[8.19] (backport #21274) tf: configurable ec_target for smoke and benchmark#21281

Merged
mergify[bot] merged 2 commits into
8.19from
mergify/bp/8.19/pr-21274
Jun 29, 2026
Merged

[8.19] (backport #21274) tf: configurable ec_target for smoke and benchmark#21281
mergify[bot] merged 2 commits into
8.19from
mergify/bp/8.19/pr-21274

Conversation

@mergify

@mergify mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Motivation/summary

Align benchmark and smoke Terraform workflows with QA-targeted runs while keeping production defaults explicit and preserving pro naming used by secret storage.

This PR:

  • adds explicit ec_target support (qa|pro) to benchmark and smoke Terraform stacks, with validation and a note that pro is the production secret-storage key
  • updates ec provider endpoint mapping to use API hosts by target (qa -> public-api.qa.cld.elstc.co, pro -> api.elastic-cloud.com)
  • passes ec_target through to the shared ec_deployment module and adds module-level target validation
  • adds admin_console_urls mapping in ec_deployment so admin_console_url resolves to QA (admin.qa.cld.elstc.co) or production (admin.found.no) correctly
  • updates smoke version lookups to resolve the API base from TF_VAR_ec_target only (normalized to lowercase) and append /api/v1 at call sites
  • sets QA workflow defaults where QA credentials are used (TF_VAR_ec_target: qa, and smoke TF_VAR_region: gcp-us-central1)
  • updates benchmark system profiles to QA-compatible ess_region values and defines worker_region per profile (closest worker region)
  • regenerates Terraform docs for testing/infra/terraform/modules/ec_deployment

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Manually trigger workflow in GH Actions

Related issues

Fixes #21268
Supersedes #21269
Follow-up to #21222


This is an automatic backport of pull request #21274 done by Mergify.

* tf: Configurable ec_target

* Revert change

* Push ec_target down to ec_deployment

* Refactor

* Revert standalone ac url

* Update region

* Smoke test set EC target

* Update to use QA regions

* Change qa region

* Move worker to same region

* Use closest region in profiles

* tf format

* Address review comments

* fail fast

* Description

* Update readme

* Remove EC_TARGET

(cherry picked from commit 3ecb34d)

# Conflicts:
#	testing/infra/terraform/modules/ec_deployment/outputs.tf
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jun 29, 2026
@mergify mergify Bot requested a review from a team as a code owner June 29, 2026 10:02
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 3ecb34d has failed:

On branch mergify/bp/8.19/pr-21274
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 3ecb34da.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/benchmarks.yml
	modified:   .github/workflows/smoke-tests-os.yml
	modified:   testing/benchmark/README.md
	modified:   testing/benchmark/main.tf
	modified:   testing/benchmark/system-profiles/16GB_ARM-x2zone.tfvars
	modified:   testing/benchmark/system-profiles/16GBx2zone-aws.tfvars
	modified:   testing/benchmark/system-profiles/16GBx2zone-azure.tfvars
	modified:   testing/benchmark/system-profiles/16GBx2zone-gcp.tfvars
	modified:   testing/benchmark/system-profiles/32GB_ARM-x2zone.tfvars
	modified:   testing/benchmark/system-profiles/32GBx2zone-aws.tfvars
	modified:   testing/benchmark/system-profiles/32GBx2zone-azure.tfvars
	modified:   testing/benchmark/system-profiles/32GBx2zone-gcp.tfvars
	modified:   testing/benchmark/system-profiles/8GB_ARM-x1zone.tfvars
	modified:   testing/benchmark/system-profiles/8GBx1zone-aws.tfvars
	modified:   testing/benchmark/system-profiles/8GBx1zone-azure.tfvars
	modified:   testing/benchmark/system-profiles/8GBx1zone-gcp.tfvars
	modified:   testing/benchmark/variables.tf
	modified:   testing/infra/terraform/modules/ec_deployment/README.md
	modified:   testing/infra/terraform/modules/ec_deployment/variables.tf
	modified:   testing/smoke/lib.sh
	modified:   testing/smoke/supported-os/main.tf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/infra/terraform/modules/ec_deployment/outputs.tf

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@prodsecmachine

prodsecmachine commented Jun 29, 2026

Copy link
Copy Markdown

Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues
Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

Comment thread testing/infra/terraform/modules/ec_deployment/outputs.tf Outdated
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Queued — the merge queue status continues in this comment ↓.

@mergify mergify Bot added the queued label Jun 29, 2026
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Merge Queue Status

This pull request spent 4 minutes 23 seconds in the queue, including 3 minutes 42 seconds running CI.

Required conditions to merge

mergify Bot added a commit that referenced this pull request Jun 29, 2026
@mergify mergify Bot merged commit 3b4b413 into 8.19 Jun 29, 2026
24 of 25 checks passed
@mergify mergify Bot deleted the mergify/bp/8.19/pr-21274 branch June 29, 2026 13:46
@mergify mergify Bot removed the queued label Jun 29, 2026
@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

cc @carsonip

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants