diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c4a98586cf..b7378726f8 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -470,13 +470,26 @@ jobs: - name: Install code-server # Pinned so that a code-server release cannot change the editor UI the # tests drive without the change showing up here first. - run: curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.137.0 + # The installer curls the .deb once. A reset (curl exit 56) fails the + # job. A repeat resumes the partial file the installer leaves behind. + run: | + set -euo pipefail + for attempt in 1 2 3 4 5; do + if curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.137.0; then + exit 0 + fi + echo "code-server install failed (attempt ${attempt}); retrying" + sleep $((attempt * 5)) + done + echo "code-server install failed after 5 attempts" + exit 1 - name: Install Playwright browsers working-directory: ./vscode/extension run: pnpm exec playwright install - name: Run e2e tests working-directory: ./vscode/extension - timeout-minutes: 30 + # CI runs one worker. That needs a longer cap than the old 30 minutes. + timeout-minutes: 60 run: | source ../../.venv/bin/activate pnpm run test:e2e diff --git a/vscode/extension/playwright.config.ts b/vscode/extension/playwright.config.ts index 34b883113d..5b5f42ecb3 100644 --- a/vscode/extension/playwright.config.ts +++ b/vscode/extension/playwright.config.ts @@ -8,7 +8,10 @@ export default defineConfig({ timeout: 180_000, // TODO: When stable, allow retries in CI retries: process.env.CI ? 2 : 0, - workers: process.env.CI ? 2 : 4, + // One worker on CI. Two workers each start code-server, Chromium, and a + // SQLMesh virtualenv, which starved a GitHub-hosted runner until it lost + // communication with the service. + workers: process.env.CI ? 1 : 4, reporter: [['html', { outputFolder: 'playwright-report' }], ['list']], projects: [ { diff --git a/vscode/extension/tests/lineage.spec.ts b/vscode/extension/tests/lineage.spec.ts index 66e3048246..e0fd1e73b8 100644 --- a/vscode/extension/tests/lineage.spec.ts +++ b/vscode/extension/tests/lineage.spec.ts @@ -129,7 +129,6 @@ test('Lineage panel renders correctly - absolute path project outside of workspa await testLineageWithProjectPath(page) }) -// These work on local machine when debuggin but not on CI, so skipping for now test('Lineage panel renders correctly - multiworkspace setup', async ({ page, sharedCodeServer, @@ -174,7 +173,10 @@ test('Lineage panel renders correctly - multiworkspace setup', async ({ ) await openServerPage(page, workspaceFilePath, sharedCodeServer) - await page.reload() + // The first load already has both folders. Reloading ?workspace= keeps the + // workspace title and clears the folders ("No Folder Opened"), so the LSP + // never starts. + await page.getByText('sushi1', { exact: true }).waitFor() await testLineageWithProjectPath(page) }) @@ -228,6 +230,6 @@ test('Lineage panel renders correctly - multiworkspace setup reversed', async ({ ) await openServerPage(page, workspaceFilePath, sharedCodeServer) - await page.reload() + await page.getByText('sushi2', { exact: true }).waitFor() await testLineageWithProjectPath(page) })