Merge remote-tracking branch 'selenium/trunk' into 4.20.0

Signed-off-by: Viet Nguyen Duc <[email protected]>

.circleci/config.yml

@@ -126,7 +126,8 @@ jobs:
       - run:
           name: "Prepare workflow environment variables"
           command: |
-            export SELENIUM_VERSION=$(grep selenium-server Base/Dockerfile | sed 's/.*-\([^-]*\)\.jar \\/\1/' | head -n 1)
+            export SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
+            export BINDING_VERSION=$(grep BINDING_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
             echo "Prepare workflow environment variables"
             echo 'export BRANCH='$SELENIUM_VERSION >> $BASH_ENV
             echo 'export BUILD_DATE=$(date '+%Y%m%d')' >> $BASH_ENV
@@ -229,6 +230,7 @@ jobs:
           command: |
             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 "export BINDING_VERSION=$(grep BINDING_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)" >> $BASH_ENV
             source $BASH_ENV
             echo "Prepare workflow environment variables"
             echo 'export BRANCH='$SELENIUM_VERSION >> $BASH_ENV

.github/workflows/build-test.yml

@@ -19,10 +19,18 @@ jobs:
     name: Build & test Docker images with random user
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         use-random-user: [false, true]
     steps:
       - uses: actions/checkout@main
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          platforms: linux/amd64,linux/arm64
+          use: false
       - name: Output Docker info
         run: docker info
       - name: Set up Python

.github/workflows/deploy.yml

@@ -19,6 +19,13 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          platforms: linux/amd64,linux/arm64
+          use: false
       - name: Output Docker info
         run: docker info
       - name: Sets build date

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

@@ -78,6 +78,13 @@ jobs:
       - uses: actions/checkout@main
       - name: Output Docker info
         run: docker info
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          platforms: linux/amd64,linux/arm64
+          use: false
       - name: Set up Python
         uses: actions/setup-python@main
         with:

.github/workflows/nightly.yaml

@@ -15,6 +15,13 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          platforms: linux/amd64,linux/arm64
+          use: false
       - name: Output Docker info
         run: docker info
       - name: Sets build date

.github/workflows/test-video.yml

@@ -39,6 +39,13 @@ jobs:
           test-strategy: [test_video, test_parallel, test_node_docker]
     steps:
       - uses: actions/checkout@main
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          platforms: linux/amd64,linux/arm64
+          use: false
       - name: Output Docker info
         run: docker info
       - name: Set up Python

.github/workflows/update-dev-beta-browser-images.yml

@@ -23,6 +23,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@main
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@master
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@master
+      with:
+        platforms: linux/amd64,linux/arm64
+        use: false
     - name: Setup environment variables
       run: |
         export SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)

Base/Dockerfile

@@ -17,7 +17,7 @@ ARG UID=1200
 ARG GID=1201
 ARG TZ="UTC"
 ARG JRE_VERSION=17
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 ARG TARGETVARIANT
 
 USER root
@@ -36,10 +36,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
-RUN  echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \
-  && echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \
-  && echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list \
-  && apt-get -qqy update \
+RUN apt-get -qqy update \
   && apt-get upgrade -yq \
   && apt-get -qqy --no-install-recommends install \
     acl \
@@ -107,14 +104,18 @@ RUN  echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/ap
 #=====
 # Download observability related OpenTelemetry jars and make them available in a separate directory
 # so that the container can skip downloading them everytime it comes up
-#=====
-  && curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
-  && chmod +x /tmp/cs \
-  && mkdir -p /external_jars \
-  && chmod -R 775 /external_jars \
-  && /tmp/cs fetch --classpath --cache /external_jars \
-    io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
-    io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt \
+#===== \
+  && if [ `arch` = "aarch64" ] || [ `arch` = "x86_64" ]; then \
+        curl -fL https://github.com/coursier/launchers/raw/master/cs-`arch`-pc-linux.gz | gzip -d > /tmp/cs \
+        && chmod +x /tmp/cs \
+        && mkdir -p /external_jars \
+        && chmod -R 775 /external_jars ; \
+     fi \
+  && if [ -f "/tmp/cs" ]; then \
+        /tmp/cs fetch --classpath --cache /external_jars \
+        io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
+        io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt ; \
+     fi \
   && chmod 664 /external_jars/.classpath.txt \
   && rm -fr /root/.cache/* \
   # (Note that .bashrc is only executed in interactive bash shells.)