Merge branch 'SeleniumHQ:trunk' into chromium-cleanup

Author: cgoldberg

.ffmpeg/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:noble AS builder
-ARG FFMPEG_VERSION="8.0.1"
-ARG RCLONE_VER="v1.72.0"
+ARG FFMPEG_VERSION="8.1"
+ARG RCLONE_VER="v1.73-stable"
 ARG GO_VERSION="latest"
 #ARG GO_CRYPTO_VERSION="v0.36.0"
 #ARG GO_OAUTH2_VERSION="v0.27.0"
@@ -33,9 +33,8 @@ RUN if [ "${GO_VERSION}" = "latest" ]; then \
     && go version
 
 RUN cd /usr/local/src \
-    && git clone https://github.com/rclone/rclone.git --filter=blob:none \
+    && git clone -b ${RCLONE_VER} --single-branch --depth 1 https://github.com/rclone/rclone.git \
     && cd rclone \
-    && git checkout ${RCLONE_VER} \
     # Patch deps version in go.mod to fix CVEs
 #    && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
 #    && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
@@ -62,9 +61,8 @@ RUN cd /usr/local/src \
 # Install FFmpeg from source
 #======================================
 RUN cd /usr/local/src \
-    && git clone https://github.com/FFmpeg/FFmpeg.git --filter=blob:none \
+    && git clone -b release/${FFMPEG_VERSION} --single-branch --depth 1 https://github.com/FFmpeg/FFmpeg.git \
     && cd FFmpeg \
-    && git checkout n${FFMPEG_VERSION} \
     && rm -rf .git \
     && PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" FFMPEG_VERSION=${FFMPEG_VERSION} ./configure \
     --prefix="/usr/local" \

.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.39.0-20251212? Please use the full tag, avoid "latest"
+      placeholder: 4.43.0-20260404? Please use the full tag, avoid "latest"
     validations:
       required: true
   - type: input

.github/actions/get-latest-upstream/action.yml

@@ -6,32 +6,51 @@ inputs:
     required: false
     type: boolean
     default: false
+  version:
+    description: 'Specific Selenium version or release tag to use, e.g 4.42.1'
+    required: false
+    default: ''
   gh_cli_token:
     description: 'GitHub CLI authentication token'
     required: true
     type: secret
+  authors:
+    description: 'GitHub organization or user to fetch Selenium releases from'
+    required: false
+    default: 'SeleniumHQ'
 
 runs:
   using: "composite"
   steps:
     - name: Get latest upstream
       shell: bash
+      env:
+        AUTHORS: ${{ inputs.authors }}
+        REQUESTED_VERSION: ${{ inputs.version }}
       run: |
         sudo apt update
         sudo apt install jq
         AUTH_HEADER="Authorization: token ${{ inputs.gh_cli_token }}"
-        if [ "${{ inputs.release }}" = "true" ]; then
+        RELEASES=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases)
+        if [ -n "${REQUESTED_VERSION}" ]; then
+          echo "Getting the requested Selenium release: ${REQUESTED_VERSION}"
+          RELEASE=$(echo "${RELEASES}" | jq -r --arg requested "${REQUESTED_VERSION}" '[.[]? | select(.tag_name == $requested or .tag_name == ("selenium-" + $requested) or ([.assets[]?.name] | index("selenium-server-" + $requested + ".jar")))] | .[0].tag_name')
+          if [ -z "${RELEASE}" ] || [ "${RELEASE}" = "null" ]; then
+            echo "Requested Selenium release not found: ${REQUESTED_VERSION}"
+            exit 1
+          fi
+        elif [ "${{ inputs.release }}" = "true" ]; then
           echo "Getting the latest stable release."
-          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
+          RELEASE=$(echo "${RELEASES}" | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
         else
           echo "Getting the latest Nightly release."
-          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == true)] | .[0].tag_name' || echo "")
+          RELEASE=$(echo "${RELEASES}" | jq -r '[.[]? | select(.prerelease == true)] | .[0].tag_name' || echo "")
           if [ -z "${RELEASE}" ] || [ "${RELEASE}" = "null" ]; then
             echo "Nightly release not found, getting the latest stable release."
-            RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
+            RELEASE=$(echo "${RELEASES}" | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
           fi
         fi
-        jar_file=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases/tags/${RELEASE} | jq -r '.assets[] | select(.name | endswith(".jar")) | .name' | tail -n 1)
+        jar_file=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases/tags/${RELEASE} | jq -r '.assets[] | select(.name | endswith(".jar")) | .name' | tail -n 1)
         echo "Server package: ${jar_file}"
         VERSION=$(echo $jar_file | sed 's/selenium-server-//;s/\.jar//')
         echo "BASE_RELEASE=${RELEASE} | BASE_VERSION=${VERSION} | VERSION=${VERSION}"

.github/workflows/build-ffmpeg.yml

@@ -45,7 +45,7 @@ jobs:
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
         env:
           NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
-          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Build images
         uses: nick-invision/retry@master
         with:
@@ -61,6 +61,9 @@ jobs:
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      - name: Login GitHub Container Registry
+        if: ${{ github.event.inputs.release == 'true' }}
+        run: echo "${{ secrets.SELENIUM_CI_TOKEN }}" | docker login ghcr.io -u "${{ secrets.SELENIUM_CI_USERNAME }}" --password-stdin
       - name: Deploy new images
         if: ${{ github.event.inputs.release == 'true' }}
         uses: nick-invision/retry@master
@@ -70,3 +73,12 @@ jobs:
           retry_wait_seconds: 300
           command: |
             make release_ffmpeg_latest
+      - name: Mirror images to GHCR
+        if: ${{ github.event.inputs.release == 'true' }}
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 20
+          max_attempts: 5
+          retry_wait_seconds: 300
+          command: |
+            GHCR_NAMESPACE="ghcr.io/$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" make release_ffmpeg_ghcr_latest

.github/workflows/create-changelog-pr.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Create CHANGELOG directory
         run: mkdir -p ./CHANGELOG/${{ inputs.grid-version }}
       - name: Download results
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ./CHANGELOG/${{ inputs.grid-version }}
           pattern: 'image_tags_*'

.github/workflows/deploy.yml

@@ -8,6 +8,10 @@ on:
         required: true
         type: string
         default: 'true'
+      version:
+        description: 'Specific Selenium version or release tag to use, e.g 4.42.1'
+        required: false
+        default: ''
       release:
         description: 'Deploy a new release'
         required: false
@@ -82,7 +86,9 @@ jobs:
         uses: ./.github/actions/get-latest-upstream
         with:
           release: ${{ github.event.inputs.stable || true }}
+          version: ${{ github.event.inputs.version || '' }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
+          authors: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Sets build date
         run: |
           if [ -z "${BUILD_DATE}" ]; then
@@ -95,7 +101,7 @@ jobs:
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
         env:
           NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
-          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
           BUILD_DATE: ${{ github.event.inputs.build-date || '' }}
       - name: Sets prerelease to false by default
         run: echo "PRERELEASE=false" >> $GITHUB_ENV
@@ -145,6 +151,9 @@ jobs:
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      - name: Login GitHub Container Registry
+        if: github.event.inputs.skip-build-push-image != 'true'
+        run: echo "${{ secrets.SELENIUM_CI_TOKEN }}" | docker login ghcr.io -u "${{ secrets.SELENIUM_CI_USERNAME }}" --password-stdin
       - name: Deploy new images
         if: github.event.inputs.skip-build-push-image != 'true'
         uses: nick-invision/retry@master
@@ -153,6 +162,14 @@ jobs:
           max_attempts: 5
           retry_wait_seconds: 300
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release
+      - name: Mirror versioned images to GHCR
+        if: github.event.inputs.skip-build-push-image != 'true'
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 30
+          max_attempts: 5
+          retry_wait_seconds: 300
+          command: GHCR_NAMESPACE="ghcr.io/$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_ghcr
       - name: Tag images as latest
         if: github.event.inputs.skip-build-push-image != 'true'
         run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make tag_latest
@@ -164,6 +181,14 @@ jobs:
           max_attempts: 5
           retry_wait_seconds: 300
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_latest
+      - name: Mirror latest images to GHCR
+        if: github.event.inputs.skip-build-push-image != 'true'
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 20
+          max_attempts: 5
+          retry_wait_seconds: 300
+          command: GHCR_NAMESPACE="ghcr.io/$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_ghcr_latest
       - name: Update package versions
         run: make update_browser_versions_matrix
 #          make generate_latest_sbom
@@ -176,6 +201,14 @@ jobs:
           max_attempts: 5
           retry_wait_seconds: 300
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} PUSH_IMAGE=true make tag_and_push_browser_images
+      - name: Mirror browser images to GHCR
+        if: github.event.inputs.skip-build-push-image != 'true'
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 30
+          max_attempts: 5
+          retry_wait_seconds: 300
+          command: GHCR_NAMESPACE="ghcr.io/$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make tag_and_push_browser_images_ghcr
       - name: Delete previous nightly tag & release if any
         uses: dev-drprasad/delete-tag-and-release@master
         with:
@@ -208,7 +241,7 @@ jobs:
       - name: Create Release
         if: env.LATEST_TAG != env.NEXT_TAG
         id: create_release
-        uses: softprops/action-gh-release@v2.5.0
+        uses: softprops/action-gh-release@v3.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"

.github/workflows/docker-test.yml

@@ -55,34 +55,39 @@ jobs:
             os: ubuntu-24.04
             firefox-install-lang-package:
             enable-managed-downloads:
+            retain-on-failure:
           - test-strategy: test_video_dynamic_name
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04
             firefox-install-lang-package:
             enable-managed-downloads:
+            retain-on-failure:
           - test-strategy: test_video_standalone
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04
             firefox-install-lang-package:
             enable-managed-downloads:
+            retain-on-failure:
           - test-strategy: test_node_docker
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04
             firefox-install-lang-package:
             enable-managed-downloads:
+            retain-on-failure:
           - test-strategy: test_standalone_docker
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04
             firefox-install-lang-package:
             enable-managed-downloads:
+            retain-on-failure:
           - test-strategy: test_parallel
             use-random-user: false
             test-video: false
@@ -119,34 +124,39 @@ jobs:
             os: ubuntu-24.04-arm
             firefox-install-lang-package: true
             enable-managed-downloads: true
+            retain-on-failure: true
           - test-strategy: test_video_dynamic_name
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04-arm
             firefox-install-lang-package: true
             enable-managed-downloads: true
+            retain-on-failure: true
           - test-strategy: test_video_standalone
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04-arm
             firefox-install-lang-package: true
             enable-managed-downloads: true
-          - test-strategy: test_node_docker
+            retain-on-failure: true
+          - test-strategy: test_node_docker_video_sidecar
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04-arm
             firefox-install-lang-package: true
             enable-managed-downloads: false
-          - test-strategy: test_standalone_docker
+            retain-on-failure: true
+          - test-strategy: test_standalone_docker_video_sidecar
             use-random-user: false
             test-video: true
             build-all: false
             os: ubuntu-24.04-arm
             firefox-install-lang-package: true
             enable-managed-downloads: true
+            retain-on-failure: true
           - test-strategy: test_parallel
             use-random-user: false
             test-video: false
@@ -212,12 +222,13 @@ jobs:
         with:
           release: ${{ inputs.release || false }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
+          authors: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Sets build date
         run: |
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
-          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Build Docker images
         uses: nick-invision/retry@master
         if: matrix.build-all == true
@@ -245,9 +256,13 @@ jobs:
           if [ -n "${SELENIUM_ENABLE_MANAGED_DOWNLOADS}" ]; then
               echo "SELENIUM_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS}" >> $GITHUB_ENV
           fi
+          if [ -n "${TEST_RETAIN_ON_FAILURE}" ]; then
+              echo "TEST_RETAIN_ON_FAILURE=${TEST_RETAIN_ON_FAILURE}" >> $GITHUB_ENV
+          fi
         env:
           TEST_FIREFOX_INSTALL_LANG_PACKAGE: ${{ matrix.firefox-install-lang-package }}
           SELENIUM_ENABLE_MANAGED_DOWNLOADS: ${{ matrix.enable-managed-downloads }}
+          TEST_RETAIN_ON_FAILURE: ${{ matrix.retain-on-failure }}
       - name: Run Docker Compose to ${{ matrix.test-strategy }} on AMD64
         if: contains(matrix.os, 'arm') == false
         uses: nick-invision/retry@master
@@ -267,6 +282,7 @@ jobs:
           command: |
             USE_RANDOM_USER_ID=${{ matrix.use-random-user }} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} \
             TEST_FIREFOX_INSTALL_LANG_PACKAGE=${TEST_FIREFOX_INSTALL_LANG_PACKAGE} SELENIUM_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS} \
+            TEST_RETAIN_ON_FAILURE=${TEST_RETAIN_ON_FAILURE} \
             make ${{ matrix.test-strategy }}
       - name: Upload recorded video
         if: matrix.test-video == true

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

@@ -181,12 +181,13 @@ jobs:
         with:
           release: ${{ inputs.release || false }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
+          authors: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Sets build date
         run: |
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
-          AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
+          AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
       - name: Build Helm charts
         run: |
           BUILD_DATE=${BUILD_DATE} make chart_build