Skip to content

[ci] Bump 9.5.0: route serverless Cypress to serverless ES (fix for #263740)#264100

Draft
patrykkopycinski wants to merge 23 commits intoelastic:mainfrom
patrykkopycinski:pr-263740-bump-9.5.0-cypress-no-es-docker
Draft

[ci] Bump 9.5.0: route serverless Cypress to serverless ES (fix for #263740)#264100
patrykkopycinski wants to merge 23 commits intoelastic:mainfrom
patrykkopycinski:pr-263740-bump-9.5.0-cypress-no-es-docker

Conversation

@patrykkopycinski
Copy link
Copy Markdown
Contributor

Summary

Parallel draft of #263740 with the CI fix applied so I can babysit the build while the main PR stays in place.

The 9.5.0 ES Docker image isn't published yet (circular dep with the unified release), so Cypress must fall back to the snapshot tar.gz. This PR:

  1. Reverts 30d27f8 — restores dynamic DOCKER_TAG = \${pkg.version}-SNAPSHOT`and re-addsexport CYPRESS_ES_FROM=snapshotinsetup_job_env.sh. Without this, stateful Cypress pulled ES 9.4.0 against Kibana 9.5.0 and crashed with This version of Kibana (v9.5.0-SNAPSHOT) is incompatible with the following Elasticsearch nodes in your cluster: v9.4.0`.
  2. Narrows CYPRESS_ES_FROM scope in x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts so it only overrides the stateful path. Without this, 58d9e42's earlier snapshot attempt broke serverless Cypress suites because a stateful tar.gz rejected xpack.security.authc.native_roles.enabled and serverless.search.enable_replicas_for_instant_failover as unknown setting.

Net effect: stateful Cypress uses the snapshot tar.gz, serverless Cypress keeps using kibana-ci/elasticsearch-serverless, and the Kibana/ES version match is restored.

Diff (3 files, +14/−3)

  • .buildkite/scripts/common/setup_job_env.sh
  • src/platform/packages/shared/kbn-es/src/utils/docker.ts
  • x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel.ts

Test plan

  • /ci — wait for green build on stateful + serverless Cypress jobs (Defend Workflows, Security Solution, Osquery, etc.)
  • Confirm [elasticsearch-service] no longer reports a version mismatch
  • Confirm serverless Cypress suites still boot ES from kibana-ci/elasticsearch-serverless

Made with Cursor

mistic and others added 20 commits April 9, 2026 06:15
…ES_FROM=snapshot

The 9.5.0 ES Docker image isn't published yet (circular dep with the
unified release), so Cypress must fall back to the snapshot tar.gz.

Re-adds `CYPRESS_ES_FROM=snapshot` in setup_job_env.sh and restores the
dynamic `${pkg.version}-SNAPSHOT` DOCKER_TAG (reverting 30d27f8). That
alone breaks *serverless* Cypress suites because parallel.ts let the env
var unconditionally override `esTestCluster.from: serverless`, so ES
booted from a stateful snapshot with serverless-only settings and
crashed with:

  unknown setting [xpack.security.authc.native_roles.enabled]
  unknown setting [serverless.search.enable_replicas_for_instant_failover]

Flip the precedence so a serverless config always wins, and
CYPRESS_ES_FROM only influences stateful runs.
@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@elasticmachine
Copy link
Copy Markdown
Contributor

🤖 Jobs for this PR can be triggered through checkboxes. 🚧

ℹ️ To trigger the CI, please tick the checkbox below 👇

  • Click to trigger kibana-pull-request for this PR!
  • Click to trigger kibana-deploy-project-from-pr for this PR!
  • Click to trigger kibana-deploy-cloud-from-pr for this PR!
  • Click to trigger kibana-entity-store-performance-from-pr for this PR!
  • Click to trigger kibana-storybooks-from-pr for this PR!

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

Build 429856 — fix validated, 2 unrelated flakes blocking green

Fix-validated signals (all green on this build):

  • Linting, Check Types, and all Security Solution Cypress jobs (stateful + serverless) passed.
  • No This version of Kibana (v9.5.0-SNAPSHOT) is incompatible ... v9.4.0 in any log.
  • No unknown setting [xpack.security.authc.native_roles.enabled] / unknown setting [serverless.search.enable_replicas_for_instant_failover] in any serverless Cypress boot log.

Failures (2, both unrelated to this PR):

Retrying via /ci below.

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

Build 430018 — core fix validated, 2 tracked-flake failures

All failures on this build are pre-existing, tracked Scout flakes unrelated to this PR's diff (setup_job_env.sh, docker.ts, parallel.ts):

Job Tracked flake Fail count
Scout: `security / entity_store` #256862 199
Scout: `platform / streams_app-stateful-classic` #260324 7

The ES provisioning fix itself is validated — every Security Solution Cypress job on this build has passed.

Retrying to let the flakes pass on retry.

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

1 similar comment
@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

2 similar comments
@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

1 similar comment
@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

/ci

@patrykkopycinski
Copy link
Copy Markdown
Contributor Author

Build 430124 — ✅ fully green

All 408 jobs passed on the merged-with-main HEAD (2bd247b). This PR is ready to unblock the 9.5.0 Kibana bump.

Follow-up / long-term solution: #264218 auto-detects when the matching ES Docker image isn't yet published (so the same scenario doesn't block future 9.6.0 / 9.7.0 / ... bumps). Already green on its own CI.

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants