Merge pull request #70 from seleniumhq-community/4.19.0-release

Sync 4.19.0 release

Author: VietND96

.circleci/config.yml

@@ -205,8 +205,6 @@ jobs:
       BUILD_ARGS: << parameters.build-args >>
       MAKE_TARGETS: << parameters.make-targets >>
       DEPLOY_BRANCH: trunk
-      RELEASE: selenium-4.18.0
-      SELENIUM_VERSION: 4.18.1
       GITHUB_USER: seleniumhq-community
       GITHUB_REPO: docker-seleniarm
     steps:
@@ -229,11 +227,11 @@ jobs:
       - run:
           name: "Prepare workflow environment variables"
           command: |
-            #export SELENIUM_VERSION=$(grep selenium-server Base/Dockerfile | sed 's/.*-\([^-]*\)\.jar \\/\1/' | head -n 1)
+            echo 'export SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)' >> $BASH_ENV
+            echo 'export RELEASE=$(grep BASE_RELEASE Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)' >> $BASH_ENV
             echo "Prepare workflow environment variables"
             echo 'export BRANCH='$SELENIUM_VERSION >> $BASH_ENV
             echo 'export BUILD_DATE=$(date '+%Y%m%d')' >> $BASH_ENV
-            #echo 'export BUILD_DATE=20230110' >> $BASH_ENV
             echo 'export RELEASE_TAG="seleniarm-v`echo $BRANCH`-`echo $BUILD_DATE`"' >> $BASH_ENV
             source $BASH_ENV
             echo "Workflow environment variables:"
@@ -339,7 +337,7 @@ workflows:
     jobs:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-base
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: base_multi
           machine-type: ubuntu2004arm64large
@@ -350,7 +348,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-full-grid
           requires: [deploy-multi-arch-base]
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: grid_multi
           machine-type: ubuntu2004arm64
@@ -361,7 +359,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-node-base
           requires: [deploy-multi-arch-base]
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: node_base_multi
           machine-type: ubuntu2004arm64large
@@ -372,7 +370,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-firefox
           requires: [deploy-multi-arch-node-base]
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: firefox_multi
           machine-type: ubuntu2004arm64large
@@ -383,7 +381,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-chromium
           requires: [deploy-multi-arch-node-base]
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: chromium_multi
           machine-type: ubuntu2004arm64large
@@ -394,7 +392,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-release-notes
           requires: [deploy-multi-arch-firefox,deploy-multi-arch-chromium]
-          platforms: linux/arm64,linux/amd64
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
           build-args: --push
           make-targets: tag_and_push_multi_arch_browser_images
           machine-type: ubuntu2004arm64

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -56,7 +56,7 @@ body:
     attributes:
       label: Docker Selenium version (image tag)
       description: What version of Docker Selenium are you using?
-      placeholder: 4.18.1-20240224? Please use the full tag, avoid "latest"
+      placeholder: 4.19.0-20240328? Please use the full tag, avoid "latest"
     validations:
       required: true
   - type: input

.github/workflows/deploy.yml

@@ -82,6 +82,12 @@ jobs:
           timeout_minutes: 20
           max_attempts: 3
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true make tag_and_push_browser_images
+      - name: Delete previous nightly tag & release if any
+        uses: dev-drprasad/delete-tag-and-release@master
+        with:
+          tag_name: nightly
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          delete_release: true
       - name: Commit files
         run: |
           git config --local user.email "[email protected]"

.github/workflows/helm-chart-test.yml

@@ -15,6 +15,10 @@ on:
         description: 'Test parameter for different request timeout'
         required: false
         default: '370'
+      max-replicas-count:
+        description: 'Test parameter for autoscaling to set maxReplicaCount'
+        required: false
+        default: '30'
       log-level:
         description: 'Test parameter for different log level'
         required: false
@@ -38,22 +42,22 @@ jobs:
             cluster: 'kind'
             helm-version: 'v3.10.3'
             test-existing-keda: true
-          - k8s-version: 'v1.26.14'
+          - k8s-version: 'v1.26.15'
             test-strategy: deployment
-            cluster: 'kind'
+            cluster: 'minikube'
             helm-version: 'v3.11.3'
             test-existing-keda: true
-          - k8s-version: 'v1.27.11'
+          - k8s-version: 'v1.27.12'
             test-strategy: job_https
-            cluster: 'kind'
+            cluster: 'minikube'
             helm-version: 'v3.12.3'
             test-existing-keda: true
-          - k8s-version: 'v1.28.7'
+          - k8s-version: 'v1.28.8'
             test-strategy: job_hostname
             cluster: 'minikube'
             helm-version: 'v3.13.3'
             test-existing-keda: false
-          - k8s-version: 'v1.29.2'
+          - k8s-version: 'v1.29.3'
             test-strategy: deployment_https
             cluster: 'minikube'
             helm-version: 'v3.14.3'
@@ -116,8 +120,11 @@ jobs:
         if: (matrix.test-strategy == 'job' || matrix.test-strategy == 'deployment') && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
         run: |
           echo "AUTOSCALING_POLL_INTERVAL=${AUTOSCALING_POLL_INTERVAL}" >> $GITHUB_ENV
+          echo "SET_MAX_REPLICAS=${SET_MAX_REPLICAS}" >> $GITHUB_ENV
+          echo "LOG_LEVEL=${LOG_LEVEL}" >> $GITHUB_ENV
         env:
           AUTOSCALING_POLL_INTERVAL: ${{ github.event.inputs.request-timeout || '370' }}
+          SET_MAX_REPLICAS: ${{ github.event.inputs.max-replicas-count || '30' }}
           LOG_LEVEL: ${{ github.event.inputs.log-level || 'FINE' }}
       - name: Test Selenium Grid on Kubernetes ${{ matrix.k8s-version }} with Autoscaling ${{ matrix.test-strategy }}
         uses: nick-invision/retry@master

Base/Dockerfile

@@ -1,13 +1,13 @@
-#FROM ubuntu:jammy-20240227
+#FROM ubuntu:jammy
 FROM debian:bookworm
 LABEL authors="Selenium <[email protected]>"
 
 # Arguments to define the version of dependencies to download
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl)
-ARG OPENTELEMETRY_VERSION=1.34.1
-ARG GRPC_VERSION=1.61.0
+ARG OPENTELEMETRY_VERSION=1.35.0
+ARG GRPC_VERSION=1.61.1
 
 #Arguments to define the user running Selenium
 ARG SEL_USER=seluser
@@ -35,6 +35,7 @@ RUN echo "VERSION is $VERSION" && echo "RELEASE is $RELEASE"
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
+ARG JRE_VERSION=17
 RUN apt-get -qqy update \
   && apt-get upgrade -yq \
   && apt-get -qqy --no-install-recommends install \
@@ -51,11 +52,12 @@ RUN apt-get -qqy update \
     gnupg2 \
     libnss3-tools \
   && mkdir -p /etc/apt/keyrings \
-  && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \
-  && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
-  && apt-get update -y \
-  && apt-get install temurin-11-jre -y \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* 
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 843C48A565F8F04B \
+  && wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc >dev/null \
+  && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list >dev/null \
+  && apt-get -qqy update \
+  && apt-get -qqy --no-install-recommends install temurin-${JRE_VERSION}-jre -y \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #===================
 
@@ -64,7 +66,7 @@ RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
     else \
        export ARCH=$TARGETARCH ; \
     fi \
-    && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/temurin-11-jre-$ARCH/conf/security/java.security
+    && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/temurin-${JRE_VERSION}-jre-$ARCH/conf/security/java.security
 
 
 #===================

Distributor/start-selenium-grid-distributor.sh

@@ -93,6 +93,11 @@ if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
 fi
 
+if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
+  echo "Appending Selenium options: --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+  SE_OPTS="$SE_OPTS --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+fi
+
 EXTRA_LIBS=""
 
 if [ "$SE_ENABLE_TRACING" = "true" ]; then

Hub/start-selenium-grid-hub.sh

@@ -66,6 +66,11 @@ if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
 fi
 
+if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
+  echo "Appending Selenium options: --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+  SE_OPTS="$SE_OPTS --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+fi
+
 EXTRA_LIBS=""
 
 if [ "$SE_ENABLE_TRACING" = "true" ]; then

Makefile

@@ -1,11 +1,11 @@
 NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
-BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.18.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.18.1)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.19.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.19.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.18.1)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.20.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.19.0)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))

NodeBase/Dockerfile

@@ -4,8 +4,14 @@ ARG AUTHORS
 FROM ${NAMESPACE}/base:${VERSION}
 LABEL authors=${AUTHORS}
 
-ARG NOVNC_VERSION="1.4.0"
-ARG WEBSOCKIFY_VERSION="0.11.0"
+# Inputs: heads, tags
+ARG NOVNC_SOURCE="heads"
+# Inputs: master, "v1.4.0"
+ARG NOVNC_VERSION="master"
+# Inputs: heads, tags
+ARG WEBSOCKIFY_SOURCE="heads"
+# Inputs: master, "v0.11.0"
+ARG WEBSOCKIFY_VERSION="master"
 
 USER root
 
@@ -97,13 +103,13 @@ RUN apt-get -qqy update \
 # noVNC exposes VNC through a web page #
 ########################################
 RUN  wget -nv -O noVNC.zip \
-       "https://github.com/novnc/noVNC/archive/refs/tags/v${NOVNC_VERSION}.zip" \
+       "https://github.com/novnc/noVNC/archive/refs/${NOVNC_SOURCE}/${NOVNC_VERSION}.zip" \
   && unzip -x noVNC.zip \
   && mv noVNC-${NOVNC_VERSION} /opt/bin/noVNC \
   && cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
   && rm noVNC.zip \
   && wget -nv -O websockify.zip \
-      "https://github.com/novnc/websockify/archive/refs/tags/v${WEBSOCKIFY_VERSION}.zip" \
+      "https://github.com/novnc/websockify/archive/refs/${WEBSOCKIFY_SOURCE}/${WEBSOCKIFY_VERSION}.zip" \
   && unzip -x websockify.zip \
   && rm websockify.zip \
   && mv websockify-${WEBSOCKIFY_VERSION} /opt/bin/noVNC/utils/websockify \
@@ -133,6 +139,14 @@ RUN chmod -R 775 ${HOME} /tmp/.X11-unix \
   && chgrp -R 0 ${HOME} /tmp/.X11-unix \
   && chmod -R g=u ${HOME} /tmp/.X11-unix
 
+#============================================
+# Shared cleanup script environment variables
+#============================================
+ENV SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP false
+ENV SE_BROWSER_LEFTOVERS_INTERVAL_SECS 3600
+ENV SE_BROWSER_LEFTOVERS_PROCESSES_SECS 7200
+ENV SE_BROWSER_LEFTOVERS_TEMPFILES_DAYS 1
+
 #===================================================
 # Run the following commands as non-privileged user
 #===================================================

NodeChrome/Dockerfile

@@ -53,6 +53,12 @@ RUN if [ ! -z "$CHROME_DRIVER_VERSION" ]; \
   && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
   && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
+#============================================
+# Chrome cleanup script and supervisord file
+#============================================
+COPY chrome-cleanup.sh /opt/bin/chrome-cleanup.sh
+COPY chrome-cleanup.conf /etc/supervisor/conf.d/chrome-cleanup.conf
+
 USER ${SEL_UID}
 
 #============================================