From 52eaad07614756b68e86aad1efdb6fb7cae33dfe Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 8 Dec 2021 10:17:19 +0100 Subject: [PATCH] ci - add name of browser to web tests --- .github/workflows/ci.yml | 12 ++++++------ .../azure-pipelines/darwin/product-build-darwin.yml | 6 +++--- build/azure-pipelines/linux/product-build-linux.yml | 6 +++--- build/azure-pipelines/win32/product-build-win32.yml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4a8bd601dc..c8043636acd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: - name: Run Unit Tests (node.js) run: yarn test-node - - name: Run Unit Tests (Browser) + - name: Run Unit Tests (Browser, Chromium) run: yarn test-browser --browser chromium - name: Compile Integration Tests @@ -84,7 +84,7 @@ jobs: - name: Run Integration Tests (Electron) run: .\scripts\test-integration.bat - - name: Run Integration Tests (Browser) + - name: Run Integration Tests (Browser, Firefox) timeout-minutes: 10 run: .\resources\server\test\test-web-integration.bat --browser firefox @@ -154,7 +154,7 @@ jobs: id: nodejs-unit-tests run: yarn test-node - - name: Run Unit Tests (Browser) + - name: Run Unit Tests (Browser, Chromium) id: browser-unit-tests run: DISPLAY=:10 yarn test-browser --browser chromium @@ -165,7 +165,7 @@ jobs: id: electron-integration-tests run: DISPLAY=:10 ./scripts/test-integration.sh - - name: Run Integration Tests (Browser) + - name: Run Integration Tests (Browser, Chromium) id: browser-integration-tests run: DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium @@ -232,7 +232,7 @@ jobs: - name: Run Unit Tests (node.js) run: yarn test-node - - name: Run Unit Tests (Browser) + - name: Run Unit Tests (Browser, Chromium) run: DISPLAY=:10 yarn test-browser --browser chromium - name: Compile Integration Tests @@ -241,7 +241,7 @@ jobs: - name: Run Integration Tests (Electron) run: DISPLAY=:10 ./scripts/test-integration.sh - - name: Run Integration Tests (Browser) + - name: Run Integration Tests (Browser, Webkit) run: DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser webkit - name: Run Integration Tests (Remote) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 39e73b2a661..5ca9eeea492 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -182,7 +182,7 @@ steps: - script: | set -e yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser) + displayName: Run unit tests (Browser, Chromium & Firefox & Webkit) timeoutInMinutes: 7 condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) @@ -204,7 +204,7 @@ steps: set -e VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \ ./resources/server/test/test-web-integration.sh --browser webkit - displayName: Run integration tests (Browser) + displayName: Run integration tests (Browser, Webkit) timeoutInMinutes: 10 condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) @@ -243,7 +243,7 @@ steps: VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \ yarn smoketest-no-compile --web --headless timeoutInMinutes: 10 - displayName: Run smoke tests (Browser) + displayName: Run smoke tests (Browser, Chromium) condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - task: PublishPipelineArtifact@0 diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 23c03767a16..2a612813309 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -172,7 +172,7 @@ steps: - script: | set -e yarn test-browser --build --browser chromium --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser) + displayName: Run unit tests (Browser, Chromium) timeoutInMinutes: 7 condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) @@ -195,7 +195,7 @@ steps: set -e VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ ./resources/server/test/test-web-integration.sh --browser chromium - displayName: Run integration tests (Browser) + displayName: Run integration tests (Browser, Chromium) timeoutInMinutes: 10 condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) @@ -233,7 +233,7 @@ steps: VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ yarn smoketest-no-compile --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" timeoutInMinutes: 10 - displayName: Run smoke tests (Browser) + displayName: Run smoke tests (Browser, Chromium) condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - task: PublishPipelineArtifact@0 diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index f37e749c99f..c9b28addafd 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -162,7 +162,7 @@ steps: . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { yarn test-browser --build --browser chromium --browser firefox --tfs "Browser Unit Tests" } - displayName: Run unit tests (Browser) + displayName: Run unit tests (Browser, Chromium & Firefox) timeoutInMinutes: 7 condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) @@ -184,7 +184,7 @@ steps: . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox } - displayName: Run integration tests (Browser) + displayName: Run integration tests (Browser, Firefox) timeoutInMinutes: 10 condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) @@ -230,7 +230,7 @@ steps: $ErrorActionPreference = "Stop" $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)" exec { yarn smoketest-no-compile --web --headless } - displayName: Run smoke tests (Browser) + displayName: Run smoke tests (Browser, Chromium) timeoutInMinutes: 10 condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))