diff options
author | deepak1556 <hop2deep@gmail.com> | 2022-02-16 20:16:46 +0300 |
---|---|---|
committer | deepak1556 <hop2deep@gmail.com> | 2022-02-16 20:16:46 +0300 |
commit | 0992d85866606397366e362b5cb86dd7c86d2f30 (patch) | |
tree | 29d5f9d1f128f3a44ed3c47dc32b1b9dda5d708e | |
parent | a0d3b2e6c430b7d0a762a57bfec0c3d1e8b7a626 (diff) |
ci: fix linux system services
Refs https://github.com/microsoft/vscode/issues/142572
-rw-r--r-- | build/azure-pipelines/linux/product-build-linux-client.yml | 16 | ||||
-rwxr-xr-x | scripts/test-integration.sh | 4 | ||||
-rwxr-xr-x | scripts/test-remote-integration.sh | 4 | ||||
-rwxr-xr-x | scripts/test.sh | 4 |
4 files changed, 19 insertions, 9 deletions
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml index 484bacf7af0..30b5dce8d75 100644 --- a/build/azure-pipelines/linux/product-build-linux-client.yml +++ b/build/azure-pipelines/linux/product-build-linux-client.yml @@ -25,6 +25,16 @@ steps: - script: | set -e + # Start X server + /etc/init.d/xvfb start + # Start dbus session + DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address) + echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT" + displayName: Setup system services + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + + - script: | + set -e tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz displayName: Extract compilation output @@ -241,7 +251,7 @@ steps: - script: | set -e 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" + yarn smoketest-no-compile --web --headless --electronArgs="--disable-dev-shm-usage" timeoutInMinutes: 10 displayName: Run smoke tests (Browser, Chromium) condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) @@ -249,7 +259,7 @@ steps: - script: | set -e APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" + yarn smoketest-no-compile --build "$APP_PATH" --electronArgs="--disable-dev-shm-usage" # Increased timeout because this test downloads stable code timeoutInMinutes: 20 displayName: Run smoke tests (Electron) @@ -259,7 +269,7 @@ steps: set -e APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ - yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader" + yarn smoketest-no-compile --build "$APP_PATH" --remote --electronArgs="--disable-dev-shm-usage" timeoutInMinutes: 10 displayName: Run smoke tests (Remote) condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index 2fb82e34740..f0d239a470d 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -6,9 +6,9 @@ if [[ "$OSTYPE" == "darwin"* ]]; then ROOT=$(dirname $(dirname $(realpath "$0"))) else ROOT=$(dirname $(dirname $(readlink -f $0))) - # --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm + # --disable-dev-shm-usage: when run on docker containers where size of /dev/shm # partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory - LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader" + LINUX_EXTRA_ARGS="--disable-dev-shm-usage" fi VSCODEUSERDATADIR=`mktemp -d 2>/dev/null` diff --git a/scripts/test-remote-integration.sh b/scripts/test-remote-integration.sh index 39c36592e24..32a83a0c9d6 100755 --- a/scripts/test-remote-integration.sh +++ b/scripts/test-remote-integration.sh @@ -6,9 +6,9 @@ if [[ "$OSTYPE" == "darwin"* ]]; then ROOT=$(dirname $(dirname $(realpath "$0"))) else ROOT=$(dirname $(dirname $(readlink -f $0))) - # --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm + # --disable-dev-shm-usage: when run on docker containers where size of /dev/shm # partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory - LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader" + LINUX_EXTRA_ARGS="--disable-dev-shm-usage" fi VSCODEUSERDATADIR=`mktemp -d 2>/dev/null` diff --git a/scripts/test.sh b/scripts/test.sh index 14a72e09cc3..66fde1df2c4 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -6,9 +6,9 @@ if [[ "$OSTYPE" == "darwin"* ]]; then ROOT=$(dirname $(dirname $(realpath "$0"))) else ROOT=$(dirname $(dirname $(readlink -f $0))) - # --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm + # --disable-dev-shm-usage: when run on docker containers where size of /dev/shm # partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory - LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader" + LINUX_EXTRA_ARGS="--disable-dev-shm-usage" fi cd $ROOT |