NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 11:02:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'andrey-add-chrome-109' into 'master'

Browse source 
Add chrome 109 to build matrix

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/639

Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Andrejs Cunskis 2023-02-07 14:38:10 +00:00
commit e0254af631
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/e2e.images.yml
View file

@ -33,7 +33,7 @@ e2e-chrome:
parallel: parallel:
matrix: matrix:
- RUBY: ['2.7', '3.0'] - RUBY: ['2.7', '3.0']
CHROME: ['106', '108'] CHROME: ['106', '109']
# Image used for running full e2e test suite # Image used for running full e2e test suite
e2e-full: e2e-full:

3
Dockerfile.custom
View file

@ -42,8 +42,9 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
# Chrome # Chrome
ARG CHROME_VERSION ARG CHROME_VERSION
ARG CHROMIUM_VERSION
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome "$CHROME_VERSION"; fi RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome "$CHROME_VERSION" "$CHROMIUM_VERSION"; fi
# NodeJS and Yarn # NodeJS and Yarn
ARG NODE_INSTALL_VERSION ARG NODE_INSTALL_VERSION

23
scripts/install-chrome
View file

@ -4,23 +4,19 @@ set -xeuo pipefail
IFS=$'\n\t' IFS=$'\n\t'
function download_noto() { function download_noto() {
local NOTO_VERSION local NOTO_VERSION
# https://github.com/googlefonts/noto-emoji/releases/tag/v2.038 # https://github.com/googlefonts/noto-emoji/releases/tag/v2.038
NOTO_VERSION="v2.038" NOTO_VERSION="v2.038"
curl --silent -O --location --fail "https://github.com/googlefonts/noto-emoji/raw/${NOTO_VERSION}/fonts/NotoColorEmoji.ttf" curl --silent -O --location --fail "https://github.com/googlefonts/noto-emoji/raw/${NOTO_VERSION}/fonts/NotoColorEmoji.ttf"
echo "NotoColorEmoji.ttf" echo "NotoColorEmoji.ttf"
} }
function download_deb() { function download_deb() {
component=$1 local COMPONENT=$1
local VERSION=$([ "${ARCH}" == "amd64" ] && echo "$CHROME_VERSION" || echo "$CHROMIUM_VERSION")
local DEB=$([ "${COMPONENT}" == "browser" ] && echo "${PKG}_${VERSION}_${ARCH}.deb" || echo "${PKG}-${COMPONENT}_${VERSION}_${ARCH}.deb")
if [ "${component}" == "browser" ]; then curl --silent --show-error --fail -O "${DOWNLOAD_URL_BASE}/${VERSION}/${DEB}"
local DEB="${PKG}_${CHROME_VERSION}_${ARCH}.deb"
else
local DEB="${PKG}-${component}_${CHROME_VERSION}_${ARCH}.deb"
fi
curl --silent --show-error --fail -O "${DOWNLOAD_URL_BASE}/${CHROME_VERSION}/$DEB"
echo "${DEB}" echo "${DEB}"
} }
@ -79,6 +75,7 @@ function build_ubi() {
BUILD_OS=${BUILD_OS:-debian} BUILD_OS=${BUILD_OS:-debian}
OS_VERSION=${OS_VERSION:-bullseye} OS_VERSION=${OS_VERSION:-bullseye}
CHROME_VERSION=${1:-107.0.5304.87-1} CHROME_VERSION=${1:-107.0.5304.87-1}
CHROMIUM_VERSION=${2:-$CHROME_VERSION}
ARCH=${TARGETARCH:-amd64} ARCH=${TARGETARCH:-amd64}
PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium") PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium")
DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/${BUILD_OS}-${OS_VERSION}-${PKG}" DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/${BUILD_OS}-${OS_VERSION}-${PKG}"

8
scripts/lib/custom-docker-build
View file

@ -81,16 +81,24 @@ function print_chrome_args() {
case "$1" in case "$1" in
106|106.0) 106|106.0)
CHROME_VERSION=106.0.5249.119-1 CHROME_VERSION=106.0.5249.119-1
CHROMIUM_VERSION=$CHROME_VERSION
;; ;;
107|107.0) 107|107.0)
CHROME_VERSION=107.0.5304.87-1 CHROME_VERSION=107.0.5304.87-1
CHROMIUM_VERSION=$CHROME_VERSION
;; ;;
108|108.0) 108|108.0)
CHROME_VERSION=108.0.5359.94-1 CHROME_VERSION=108.0.5359.94-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
109|109.0)
CHROME_VERSION=109.0.5414.119-1
CHROMIUM_VERSION=109.0.5414.74-2
;; ;;
*) fail "Unknown chrome version $1" ;; *) fail "Unknown chrome version $1" ;;
esac esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
printf -- "--build-arg CHROMIUM_VERSION=%s " "$CHROMIUM_VERSION"
} }
# see https://www.kernel.org/pub/software/scm/git # see https://www.kernel.org/pub/software/scm/git