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

Improve logging and save driver under the same package

Browse source
This commit is contained in:
Andrejs Cunskis 2022-08-22 17:13:52 +03:00
parent 4ab75d3040
commit 7ea820dde3
No known key found for this signature in database
GPG key ID: 87CB75083F227241
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/cache-google-chrome
View file

@ -12,19 +12,20 @@ function save-package() {
local PKG=$1 local PKG=$1
local DEB=$2 local DEB=$2
local LATEST_VERSION=$3 local LATEST_VERSION=$3
local SOURCE_DEB=${4:-$DEB} local REGISTRY_PACKAGE=${4:-$PKG}
local SOURCE_DEB=${5:-$DEB}
local URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PKG}/${LATEST_VERSION}/${DEB}" local URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${REGISTRY_PACKAGE}/${LATEST_VERSION}/${DEB}"
echo "Checking if cache has ${DEB}" echo "Checking if ${PKG} v${LATEST_VERSION} is already cached"
local FILE_CHECK=$(curl --silent --location --head --output /dev/null --write "%{http_code}\\n" "$URL") local FILE_CHECK=$(curl --silent --location --head --output /dev/null --write "%{http_code}\\n" "$URL")
if [ "$FILE_CHECK" -eq "200" ]; then if [ "$FILE_CHECK" -eq "200" ]; then
echo "Latest version ${LATEST_VERSION} is already cached!" echo "${PKG} v${LATEST_VERSION} is already cached!"
else else
echo "Downloading latest ${PKG} version (${LATEST_VERSION}) in apt repository..." echo "Downloading latest ${PKG} version (${LATEST_VERSION}) from apt repository..."
cd /tmp cd /tmp
apt-get download $PKG apt-get download "$PKG"
if ! [ -f "${SOURCE_DEB}" ]; then if ! [ -f "${SOURCE_DEB}" ]; then
echo "Downloaded file didn't have expected name: ${SOURCE_DEB}" echo "Downloaded file didn't have expected name: ${SOURCE_DEB}"
@ -36,7 +37,7 @@ function save-package() {
mv "$SOURCE_DEB" "$DEB" mv "$SOURCE_DEB" "$DEB"
fi fi
echo "Transferring $PKG to GitLab packages" echo "Transferring ${PKG} v${LATEST_VERSION} to GitLab packages"
curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
--upload-file "./{$DEB}" \ --upload-file "./{$DEB}" \
"$URL" "$URL"
@ -46,15 +47,12 @@ function save-package() {
function cache-chrome() { function cache-chrome() {
PKG=google-chrome-stable PKG=google-chrome-stable
echo "Updating apt to get Google Chrome packages..."
curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google.list echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google.list
echo "Updating apt to get Google Chrome packages..."
apt-get -y -qq update apt-get -y -qq update
echo "Checking for latest Chrome version in apt repository..." echo "Checking for latest '${PKG}' version in apt repository..."
LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //") LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //")
CHROME_DEB="google-chrome-stable_${LATEST_VERSION}_amd64.deb" CHROME_DEB="google-chrome-stable_${LATEST_VERSION}_amd64.deb"
@ -65,15 +63,15 @@ function cache-chromium() {
PKG=chromium PKG=chromium
PKG_DRIVER=chromium-driver PKG_DRIVER=chromium-driver
echo "Checking for latest Chromium version in apt repository..." echo "Checking for latest '${PKG}' version in apt repository..."
LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //") LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //")
VERSION_NUMBER=$(echo $LATEST_VERSION | sed -e "s/~deb.*//") # remove debian version part to have chrome and chromium compatible version numbers VERSION_NUMBER=$(echo $LATEST_VERSION | sed -e "s/~deb.*//") # remove debian version part to have chrome and chromium compatible version numbers
CHROMIUM_DEB="${PKG}_${VERSION_NUMBER}_arm64.deb" CHROMIUM_DEB="${PKG}_${VERSION_NUMBER}_arm64.deb"
CHROMIUM_DRIVER_DEB="${PKG_DRIVER}_${VERSION_NUMBER}_arm64.deb" CHROMIUM_DRIVER_DEB="${PKG_DRIVER}_${VERSION_NUMBER}_arm64.deb"
save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}_${LATEST_VERSION}_arm64.deb" # Save both chromium and chromium-driver under the same package
save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG_DRIVER}_${LATEST_VERSION}_arm64.deb" save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG}_${LATEST_VERSION}_arm64.deb"
save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG_DRIVER}_${LATEST_VERSION}_arm64.deb"
} }
echo "Updating system utils" echo "Updating system utils"