Skip to content

Revert CLI blueprint e2e test (#3961) and Windows E2E CI disable (#4008) - #4029

Merged
gcsecsey merged 1 commit into
trunkfrom
revert-e2e-cli-tests
Jul 1, 2026
Merged

Revert CLI blueprint e2e test (#3961) and Windows E2E CI disable (#4008)#4029
gcsecsey merged 1 commit into
trunkfrom
revert-e2e-cli-tests

Conversation

@gavande1

@gavande1 gavande1 commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Related issues

Proposed Changes

Reverts two previously merged changes, combined into a single PR:

The unrelated STUDIO_PROCESS_MANAGER_HOME env addition introduced by #3989 is preserved in the e2e helper.

Testing Instructions

  • Confirm CI passes, including the re-enabled Windows E2E job.

Pre-merge Checklist

  • Have you checked for TypeScript, React or other console errors?
Reverts PR #3961 (CLI integration test for creating a site from a custom Blueprint) and PR #4008 (temporarily disabling the Windows Studio E2E Buildkite job), combined into a single change. The STUDIO_PROCESS_MANAGER_HOME env addition from #3989 is preserved in the e2e helper.
@gavande1
gavande1 requested a review from a team as a code owner July 1, 2026 12:56

@gcsecsey gcsecsey left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The revert LGTM, let's wait for CI to pass before merging ⌛

@wpmobilebot

Copy link
Copy Markdown
Collaborator

📊 Performance Test Results

Comparing 3ca63bd vs trunk

app-size

Metric trunk 3ca63bd Diff Change
App Size (Mac) 1316.83 MB 1316.83 MB +0.00 MB ⚪ 0.0%

site-editor

Metric trunk 3ca63bd Diff Change
load 1102 ms 1101 ms 1 ms ⚪ 0.0%

site-startup

Metric trunk 3ca63bd Diff Change
siteCreation 6549 ms 6485 ms 64 ms 🟢 -1.0%
siteStartup 1859 ms 1865 ms +6 ms ⚪ 0.0%

Results are median values from multiple test runs.

Legend: 🟢 Improvement (faster) | 🔴 Regression (slower) | ⚪ No change (<50ms diff)

@gcsecsey

gcsecsey commented Jul 1, 2026

Copy link
Copy Markdown
Member

The failing unit test is unrelated to these changes, and seems to be flay. I retriggered the unit test job.

@gcsecsey
gcsecsey merged commit 69bc860 into trunk Jul 1, 2026
12 checks passed
@gcsecsey
gcsecsey deleted the revert-e2e-cli-tests branch July 1, 2026 14:41
@gavande1 gavande1 mentioned this pull request Jul 2, 2026
1 task
gcsecsey added a commit that referenced this pull request Jul 13, 2026
…nt (#4124)

## Related issues

- Fixes STU-1871
- Re-adds #3961, reverted in #4029

## How AI was used in this PR

Claude investigated the revert history and the current e2e harness,
restored the test from git history, adapted it to the updated harness
conventions, and verified all suites locally. I reviewed all changes.

## Proposed Changes

PR #3961 added CLI e2e coverage for `studio site create --blueprint`,
but was reverted in #4029 as part of the AINFRA-2588 Windows E2E hang
investigation. The actual causes were later found and fixed in #4082.
The blueprint tests were not at fault, so this PR re-adds them, updated
for the harness as it exists today:

- The 4 original cases (installTheme, installPlugin, runPHP, wp-cli) now
create sites with `--runtime sandbox`, matching the other CLI e2e
suites: it keeps runs hermetic, since native PHP would download its
binary into the isolated config dir on first run.
- Applying a Blueprint boots the process-manager daemon even with
`--no-start`, and since #3989 each test env gets an isolated daemon — so
teardown now runs `site stop --all` before removing the env, like the
start/stop and site-management suites, to avoid orphaning a daemon per
case.
- Re-adds #3961's harness fix: `runCli` isolates the legacy Electron
appdata dir (`E2E` + `E2E_APP_DATA_PATH`). Without it, the
Studio-compatibility startup migration finds a developer's real
pre-split `appdata-v1.json` and exits 1, failing every CLI e2e suite
locally (CI passes only because agents have no legacy config). This also
stops e2e runs from bumping production stats.

## Testing Instructions

1. Build the CLI: `npm run cli:build`.
2. Run the new suite:
`npm test -- apps/cli/commands/site/tests/create-blueprint.e2e.test.ts
--tagsFilter='e2e'`
   Confirm all four tests pass.
3. Confirm the fast suite is unaffected: `npm test --
apps/cli/commands/site/tests --tagsFilter='!e2e'` — the e2e cases are
skipped.
4. Regression check for the harness fix — the sibling suites still pass:
`npm test -- apps/cli/commands/site/tests/create.e2e.test.ts
--tagsFilter='e2e'` (on a machine with a leftover `~/Library/Application
Support/Studio/appdata-v1.json`, this fails without the harness change
and passes with it).

## Pre-merge Checklist

- [x] Have you checked for TypeScript, React or other console errors?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants