Skip to content

Include run IDs in E2E app names #7926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alfonso-noriega merged 1 commit into from
Jun 25, 2026
Merged

Include run IDs in E2E app names #7926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/e2e/setup/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,33 @@ export function requireEnv(env: E2EEnv, ...keys: (keyof Pick<E2EEnv, 'storeFqdn'
}
}

const E2E_APP_PREFIXES: Record<string, string> = {
deploy1: 'dep1',
deploy2: 'dep2',
scaffold: 'scaf',
'ext-only': 'exto',
'ext-gen': 'extg',
'hot-reload': 'hrel',
'hot-create': 'hcrt',
'hot-delete': 'hdel',
'multi-cfg': 'mcfg',
'mcfg-def': 'mdef',
'toml-deploy': 'tdep',
'toml-dev': 'tdev',
}

/**
* Generate a short E2E app name that can be clustered by GitHub Actions run.
*/
export function e2eAppName(prefix: string): string {
const runId = process.env.GITHUB_RUN_ID
const runAttempt = process.env.GITHUB_RUN_ATTEMPT ?? '1'
const runSegment = runId ? `r${BigInt(runId).toString(36)}a${runAttempt}` : 'local'
const timestampSegment = Date.now().toString(36)

return `E2E-${E2E_APP_PREFIXES[prefix] ?? prefix}-${runSegment}-${timestampSegment}`
}

/**
* Worker-scoped fixture providing environment configuration.
* Env vars are optional — tests that need them should call requireEnv().
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e/tests/app-deploy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {appTestFixture as test, createApp, deployApp, versionsList, configLink} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {stripAnsi} from '../helpers/strip-ansi.js'
import {expect} from '@playwright/test'
import * as fs from 'fs'
Expand Down Expand Up @@ -79,8 +79,8 @@ test.describe('App deploy', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-deploy1-${Date.now()}`
const secondaryAppName = `E2E-deploy2-${Date.now()}`
const appName = e2eAppName('deploy1')
const secondaryAppName = e2eAppName('deploy2')

let primaryAppUrl: string | undefined
let secondaryAppUrl: string | undefined
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e/tests/app-dev-server.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {createApp} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {CLI_TIMEOUT, TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {storeTestFixture as test} from '../setup/store.js'
import {expect} from '@playwright/test'
import * as fs from 'fs'
Expand All @@ -13,7 +13,7 @@ test.describe('App dev server', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-dev-${Date.now()}`
const appName = e2eAppName('dev')

try {
// Step 1: Create an extension-only app (no scopes needed)
Expand Down
8 changes: 4 additions & 4 deletions packages/e2e/tests/app-scaffold.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {appTestFixture as test, createApp, buildApp, generateExtension} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {expect} from '@playwright/test'
import * as fs from 'fs'
import * as path from 'path'
Expand All @@ -13,7 +13,7 @@ test.describe('App scaffold', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-scaffold-${Date.now()}`
const appName = e2eAppName('scaffold')

try {
// Step 1: Create a new app from the react-router template
Expand Down Expand Up @@ -63,7 +63,7 @@ test.describe('App scaffold', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-ext-only-${Date.now()}`
const appName = e2eAppName('ext-only')

try {
const initResult = await createApp({
Expand Down Expand Up @@ -101,7 +101,7 @@ test.describe('App scaffold', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-ext-gen-${Date.now()}`
const appName = e2eAppName('ext-gen')

try {
const initResult = await createApp({
Expand Down
8 changes: 4 additions & 4 deletions packages/e2e/tests/dev-hot-reload.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import {createApp, injectFixtureToml} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {CLI_TIMEOUT, TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {storeTestFixture as test} from '../setup/store.js'
import {updateTomlValues} from '@shopify/toml-patch'
import {expect} from '@playwright/test'
Expand Down Expand Up @@ -44,7 +44,7 @@ test.describe('Dev hot reload', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-hot-reload-${Date.now()}`
const appName = e2eAppName('hot-reload')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down Expand Up @@ -102,7 +102,7 @@ test.describe('Dev hot reload', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-hot-create-${Date.now()}`
const appName = e2eAppName('hot-create')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down Expand Up @@ -154,7 +154,7 @@ test.describe('Dev hot reload', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-hot-delete-${Date.now()}`
const appName = e2eAppName('hot-delete')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e/tests/multi-config-dev.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import {createApp, extractClientId, injectFixtureToml} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {CLI_TIMEOUT, TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {storeTestFixture as test} from '../setup/store.js'
import {expect} from '@playwright/test'
import * as fs from 'fs'
Expand All @@ -19,7 +19,7 @@ test.describe('Multi-config dev', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-multi-cfg-${Date.now()}`
const appName = e2eAppName('multi-cfg')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down Expand Up @@ -106,7 +106,7 @@ extensions_summary = "E2E staging app extensions"
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-mcfg-def-${Date.now()}`
const appName = e2eAppName('mcfg-def')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e/tests/toml-config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import {createApp, injectFixtureToml} from '../setup/app.js'
import {teardownAll} from '../setup/teardown.js'
import {CLI_TIMEOUT, TEST_TIMEOUT} from '../setup/constants.js'
import {requireEnv} from '../setup/env.js'
import {e2eAppName, requireEnv} from '../setup/env.js'
import {storeTestFixture as test} from '../setup/store.js'
import {expect} from '@playwright/test'
import * as fs from 'fs'
Expand All @@ -19,7 +19,7 @@ test.describe('TOML config regression', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-toml-deploy-${Date.now()}`
const appName = e2eAppName('toml-deploy')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down Expand Up @@ -53,7 +53,7 @@ test.describe('TOML config regression', () => {
requireEnv(env, 'orgId')

const parentDir = fs.mkdtempSync(path.join(env.tempDir, 'app-'))
const appName = `E2E-toml-dev-${Date.now()}`
const appName = e2eAppName('toml-dev')

try {
const initResult = await createApp({cli, parentDir, name: appName, template: 'none', orgId: env.orgId})
Expand Down
Loading