From bdfcc8ad23d9c8a6754de083e9930caa8837d106 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 9 Aug 2024 09:55:50 +0800 Subject: [PATCH] Switch to Chrome for Testing and drop support for Chromium (#824) We started installing Chromium because there is no linux ARM support for Chrome yet. However, trying to run tests on Chromium seems to be extra challenging. For example, upgrading to Debian 12 causes our Javascript tests to fail on Chromium but not on Chrome. Chrome for Testing was built specifically for web app testing so let's follow Google's recommendation. --- image/discourse_test/Dockerfile | 4 +--- image/discourse_test/install-chrome | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100755 image/discourse_test/install-chrome diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 2bcab2f..38bfb7c 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -17,9 +17,7 @@ RUN chown -R discourse . &&\ FROM base AS with_browsers -ENV TESTEM_DEFAULT_BROWSER Chromium -ADD install-chrome /tmp/install-chrome -RUN /tmp/install-chrome &&\ +RUN npx @puppeteer/browsers install chrome@stable &&\ apt update &&\ apt install -y libgconf-2-4 libxss1 firefox-esr &&\ cd /tmp && wget -q "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US" -O firefox.tar.bz2 &&\ diff --git a/image/discourse_test/install-chrome b/image/discourse_test/install-chrome deleted file mode 100755 index 8b9d24a..0000000 --- a/image/discourse_test/install-chrome +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -# https://googlechromelabs.github.io/chrome-for-testing/ doesn't provide -# linux/arm64 binaries for chrome or chromedriver yet. Therefore on arm64, we -# install chromium instead of chrome. -if [ "$(dpkg --print-architecture)" = "arm64" ]; then - apt update && apt install -y chromium-driver -else - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\ - echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\ - apt update &&\ - apt install -y google-chrome-stable chromium-driver -fi -- 2.25.1