Skip to content

👷 run latest firefox and webkit in CI, default local e2e to chromium #4618

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

Open
thomas-lebeau wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Open

👷 run latest firefox and webkit in CI, default local e2e to chromium #4618

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
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
CURRENT_STAGING: staging-20
APP: 'browser-sdk'
CURRENT_CI_IMAGE: 107
CURRENT_CI_IMAGE: 108
BUILD_STABLE_REGISTRY: 'registry.ddbuild.io'
CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
GIT_REPOSITORY: 'git@github.com:DataDog/browser-sdk.git'
Expand Down Expand Up @@ -244,7 +244,7 @@ e2e:
interruptible: true
parallel:
matrix:
- BROWSER: [chromium, chromium-pinned, firefox-pinned, webkit-pinned]
- BROWSER: [chromium, firefox, webkit, chromium-pinned, firefox-pinned, webkit-pinned]
artifacts:
when: always
reports:
Expand All @@ -255,7 +255,7 @@ e2e:
- yarn build:apps
# Browsers are pre-installed in the CI image. If playwright (current or pinned 1.40.1)
# is upgraded without rebuilding the image, this job will crash — rebuild the image to fix it.
- FORCE_COLOR=1 PW_BROWSER=$BROWSER yarn test:e2e --project=$BROWSER
- FORCE_COLOR=1 PW_BROWSER=$BROWSER yarn test:e2e:ci --project=$BROWSER
after_script:
- node ./scripts/test/export-test-result.ts e2e

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN curl --silent --show-error --fail http://dl.google.com/linux/chrome/deb/pool

# Current Playwright's Chromium (used by the e2e job)
ARG PLAYWRIGHT_VERSION
RUN npx -y playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium
RUN npx -y playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium firefox webkit

# Pinned Playwright browsers: Chromium 120 + Firefox 119 + WebKit 17.4 (used by the e2e-pinned job)
ARG PINNED_PLAYWRIGHT_VERSION=1.40.1
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"test:unit:watch": "yarn test:unit --no-single-run",
"test:unit:bs": "node --env-file-if-exists=.env ./scripts/test/bs-wrapper.ts karma start test/unit/karma.bs.conf.js",
"test:e2e:init": "yarn build && yarn build:apps && yarn playwright install --with-deps && yarn dlx -p playwright@1.40.1 playwright install chromium firefox webkit",
"test:e2e": "playwright test --config test/e2e/playwright.config.ts",
"test:e2e": "playwright test --config test/e2e/playwright.config.ts --project=chromium",
Comment thread
thomas-lebeau marked this conversation as resolved.
"test:e2e:ci": "playwright test --config test/e2e/playwright.config.ts",
"test:compat:tsc": "node scripts/check-typescript-compatibility.ts",
"test:compat:ssr": "scripts/cli check_server_side_rendering_compatibility",
"test:performance": "yarn test:e2e:init && playwright test --config test/performance/playwright.config.ts",
Expand Down
Loading