Skip to content

tf: configurable ec_target for smoke and benchmark#21274

Draft
carsonip wants to merge 12 commits into
mainfrom
fix-qa-ec
Draft

tf: configurable ec_target for smoke and benchmark#21274
carsonip wants to merge 12 commits into
mainfrom
fix-qa-ec

Conversation

@carsonip

@carsonip carsonip commented Jun 25, 2026

Copy link
Copy Markdown
Member

Motivation/summary

Consolidate Elastic Cloud target handling for benchmark and smoke test Terraform/workflow paths, while keeping integration server test target passthrough semantics unchanged.

This update:

  • standardizes benchmark target support around ec_target values qa|pro
  • moves admin console URL mapping into the shared ec_deployment Terraform module and passes ec_target through from benchmark
  • updates smoke tests to use EC_TARGET with target-to-API-base mapping in testing/smoke/lib.sh
  • aligns workflow defaults for QA-keyed jobs (benchmarks and smoke-tests-os) with qa

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

  • terraform fmt -recursive
  • Validate smoke API base selection from EC_TARGET in testing/smoke/lib.sh:
    • qa -> https://public-api.qa.cld.elstc.co
    • pro -> https://api.elastic-cloud.com
    • endpoint calls append /api/v1/...
  • Validate benchmark target wiring:
    • testing/benchmark/main.tf passes ec_target to module "ec_deployment"
    • provider ec endpoint map still uses API hosts (api_endpoints)
  • Validate admin console URLs:
    • testing/infra/terraform/modules/ec_deployment/outputs.tf maps:
      • qa -> https://admin.qa.cld.elstc.co
      • pro -> https://admin.found.no

Related issues

Fixes #21268
Supersedes #21269
Follow up to #21222

@prodsecmachine

prodsecmachine commented Jun 25, 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.

@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!)

@mergify

mergify Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

This pull request does not have a backport label. Could you fix it @carsonip? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8.19 is the label to automatically backport to the 8.19 branch.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@carsonip carsonip added backport-active-all Automated backport with mergify to all the active branches backport-8.19 Automated backport to the 8.19 branch backport-9.4 Automated backport with mergify and removed backport-active-all Automated backport with mergify to all the active branches labels Jun 25, 2026
@carsonip

Copy link
Copy Markdown
Member Author

Blocked by #21275

@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

💚 Build Succeeded

History

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

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.4 Automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ci: OS smoke test broken due to QA API key being passed to prod EC

2 participants