Merge remote-tracking branch 'origin/4.18.1' into trunk

[deploy]

Author: VietND96

.circleci/config.yml

@@ -205,8 +205,8 @@ jobs:
       BUILD_ARGS: << parameters.build-args >>
       MAKE_TARGETS: << parameters.make-targets >>
       DEPLOY_BRANCH: trunk
-      RELEASE: selenium-4.18.0
-      SELENIUM_VERSION: 4.18.0
+      RELEASE: selenium-4.18.1
+      SELENIUM_VERSION: 4.18.1
       GITHUB_USER: seleniumhq-community
       GITHUB_REPO: docker-seleniarm
     steps:

.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.0-20240220? Please use the full tag, avoid "latest"
+      placeholder: 4.18.1-20240224? Please use the full tag, avoid "latest"
     validations:
       required: true
   - type: input

.github/workflows/deploy.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Update tag in docs and files
         run: ./update_tag_in_docs_and_files.sh ${LATEST_TAG} ${NEXT_TAG}
       - name: Update chart CHANGELOG
-        run: ./generate_chart_changelog.sh HEAD
+        run: ./generate_chart_changelog.sh
       - name: Build images
         run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
       - name: Login Docker Hub

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

@@ -18,6 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@main
         with:
+          persist-credentials: false
           fetch-depth: 0
 
       - name: Configure Git
@@ -26,7 +27,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Get chart release notes (chart_release_notes.md)
-        run: ./generate_chart_changelog.sh HEAD
+        run: ./generate_chart_changelog.sh
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@main
@@ -36,3 +37,15 @@ jobs:
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_RELEASE_NOTES_FILE: RELEASE_NOTES.md
+
+      - name: Commit files
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "Selenium CI Bot"
+          git commit -m "Update tag in docs and files" -a || true
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
+          branch: trunk

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

@@ -15,6 +15,10 @@ on:
         description: 'Test parameter for different request timeout'
         required: false
         default: '370'
+      log-level:
+        description: 'Test parameter for different log level'
+        required: false
+        default: 'FINE'
   schedule:
     - cron: '0 0 * * *'
 
@@ -32,22 +36,34 @@ jobs:
           - k8s-version: 'v1.25.16'
             test-strategy: job
             cluster: 'kind'
+            helm-version: 'v3.10.3'
+            test-existing-keda: true
           - k8s-version: 'v1.26.14'
             test-strategy: deployment
             cluster: 'kind'
+            helm-version: 'v3.11.3'
+            test-existing-keda: true
           - k8s-version: 'v1.27.11'
             test-strategy: job_https
             cluster: 'kind'
+            helm-version: 'v3.12.3'
+            test-existing-keda: true
           - k8s-version: 'v1.28.7'
             test-strategy: job_hostname
             cluster: 'minikube'
+            helm-version: 'v3.13.3'
+            test-existing-keda: false
           - k8s-version: 'v1.29.2'
             test-strategy: deployment_https
             cluster: 'minikube'
+            helm-version: 'v3.14.3'
+            test-existing-keda: false
     env:
       CLUSTER: ${{ matrix.cluster }}
       KUBERNETES_VERSION: ${{ matrix.k8s-version }}
       ARTIFACT_NAME: ${{ matrix.k8s-version }}-${{ matrix.test-strategy }}
+      HELM_VERSION: ${{ matrix.helm-version }}
+      TEST_EXISTING_KEDA: ${{ matrix.test-existing-keda }}
     steps:
       - uses: actions/checkout@main
       - name: Output Docker info
@@ -78,7 +94,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
-          command: CLUSTER=${CLUSTER} make chart_setup_env
+          command: CLUSTER=${CLUSTER} HELM_VERSION=${HELM_VERSION} make chart_setup_env
       - name: Build Helm charts
         run: |
           BUILD_DATE=${BUILD_DATE} make chart_build
@@ -91,7 +107,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
-          command: CLUSTER=${CLUSTER} KUBERNETES_VERSION=${KUBERNETES_VERSION} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chart_cluster_setup
+          command: CLUSTER=${CLUSTER} KUBERNETES_VERSION=${KUBERNETES_VERSION} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_EXISTING_KEDA=${TEST_EXISTING_KEDA} make chart_cluster_setup
       - name: Test chart template
         run: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chart_test_template
       - name: Test set custom CA certificate
@@ -102,13 +118,14 @@ jobs:
           echo "AUTOSCALING_POLL_INTERVAL=${AUTOSCALING_POLL_INTERVAL}" >> $GITHUB_ENV
         env:
           AUTOSCALING_POLL_INTERVAL: ${{ github.event.inputs.request-timeout || '370' }}
+          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
         with:
           timeout_minutes: 30
           max_attempts: 3
           command: |
-            NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chart_test_autoscaling_${{ matrix.test-strategy }}
+            NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_EXISTING_KEDA=${TEST_EXISTING_KEDA} make chart_test_autoscaling_${{ matrix.test-strategy }}
       - name: Cleanup Kubernetes cluster
         if: always()
         run: CLUSTER=${CLUSTER} make chart_cluster_cleanup

.github/workflows/nightly.yaml

@@ -81,7 +81,11 @@ jobs:
       - name: Update tag in docs and files
         run: ./update_tag_in_docs_and_files.sh ${LATEST_TAG} ${NEXT_TAG}
       - name: Setup environment to build chart
-        run: make chart_setup_env
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: CLUSTER=${CLUSTER} HELM_VERSION=${HELM_VERSION} make chart_setup_env
       - name: Build and lint charts
         run: |
           make chart_build_nightly

.github/workflows/test-video.yml

@@ -4,20 +4,39 @@ concurrency:
 
 on:
   workflow_dispatch:
+    inputs:
+      request-timeout:
+        description: 'Test parameter for different request timeout'
+        required: false
+        default: '400'
+      parallel-hardening:
+        description: 'Test parameter to enable hardening parallel tests'
+        required: false
+        default: 'true'
+      log-level:
+        description: 'Test parameter for different log level'
+        required: false
+        default: 'INFO'
   push:
     paths-ignore:
       - '**.md'
   pull_request:
     paths-ignore:
       - '**.md'
+  schedule:
+    - cron: '0 0 * * *'
 
 permissions:
   contents: read
 
 jobs:
   build-and-test:
-    name: Test video recorded through Docker Selenium
+    name: Test Docker Selenium
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+          test-strategy: [test_video, test_parallel]
     steps:
       - uses: actions/checkout@main
       - name: Output Docker info
@@ -41,19 +60,38 @@ jobs:
         run: echo ${BRANCH}
       - name: Sets build date
         run: echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
-      - name: Run Docker Compose to record video
-        run: USE_RANDOM_USER_ID=${USE_RANDOM_USER} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make test_video
+      - name: Pre-build to reduce logs in test phase
+        run: |
+          VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make hub
+          VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chrome
+          VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make firefox
+          VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make edge
+      - name: Set test parameters
+        if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+        run: |
+          echo "LOG_LEVEL=${LOG_LEVEL}" >> $GITHUB_ENV
+          echo "TEST_PARALLEL_HARDENING=${TEST_PARALLEL_HARDENING}" >> $GITHUB_ENV
+          echo "REQUEST_TIMEOUT=${REQUEST_TIMEOUT}" >> $GITHUB_ENV
+        env:
+          LOG_LEVEL: ${{ github.event.inputs.log-level || 'INFO' }}
+          TEST_PARALLEL_HARDENING: ${{ github.event.inputs.parallel-hardening || 'true' }}
+          REQUEST_TIMEOUT: ${{ github.event.inputs.request-timeout || '400' }}
+      - name: Run Docker Compose to ${{ matrix.test-strategy }}
+        run: USE_RANDOM_USER_ID=${USE_RANDOM_USER} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make ${{ matrix.test-strategy }}
       - name: Upload recorded Chrome video
+        if: matrix.test-strategy == 'test_video'
         uses: actions/upload-artifact@main
         with:
           name: chrome_video
           path: ./tests/videos/chrome_video.mp4
       - name: Upload recorded Edge video
+        if: matrix.test-strategy == 'test_video'
         uses: actions/upload-artifact@main
         with:
           name: edge_video
           path: ./tests/videos/edge_video.mp4
       - name: Upload recorded Firefox video
+        if: matrix.test-strategy == 'test_video'
         uses: actions/upload-artifact@main
         with:
           name: firefox_video

Base/Dockerfile

@@ -1,4 +1,4 @@
-#FROM ubuntu:jammy-20240125
+#FROM ubuntu:jammy-20240227
 FROM debian:bookworm
 LABEL authors="Selenium <[email protected]>"
 

Makefile

@@ -2,10 +2,10 @@ 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.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.18.1)
 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.0)
+VERSION := $(or $(VERSION),$(VERSION),4.18.1)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
@@ -506,6 +506,7 @@ test_firefox:
 test_firefox_standalone:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
+<<<<<<< HEAD
 
 # Test multi-arch container images
 test_multi_arch: test_chromium_multi \
@@ -526,6 +527,20 @@ test_firefox_multi:
 test_firefox_standalone_multi:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
+=======
+test_parallel: hub chrome firefox edge
+	for node in DeploymentAutoscaling JobAutoscaling ; do \
+			cd ./tests || true ; \
+			echo TAG=$(TAG_VERSION) > .env ; \
+			echo TEST_DRAIN_AFTER_SESSION_COUNT=$(or $(TEST_DRAIN_AFTER_SESSION_COUNT), 0) >> .env ; \
+			echo TEST_PARALLEL_HARDENING=$(or $(TEST_PARALLEL_HARDENING), "false") >> .env ; \
+			echo LOG_LEVEL=$(or $(LOG_LEVEL), "INFO") >> .env ; \
+			echo REQUEST_TIMEOUT=$(or $(REQUEST_TIMEOUT), 300) >> .env ; \
+			echo NODE=$$node >> .env ; \
+			echo UID=$$(id -u) >> .env ; \
+			docker-compose -f docker-compose-v3-test-parallel.yml up --no-log-prefix --exit-code-from tests --build ; \
+	done
+>>>>>>> origin/4.18.1
 
 # This should run on its own CI job. There is no need to combine it with the other tests.
 # Its main purpose is to check that a video file was generated.
@@ -593,16 +608,18 @@ chart_test_edge:
 
 chart_test_autoscaling_deployment_https:
 	CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 \
+	SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh DeploymentAutoscaling
 
 chart_test_autoscaling_deployment:
-	CHART_ENABLE_TRACING=true SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_HOST=$$(hostname -i) \
+	CHART_ENABLE_TRACING=true SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_HOST=$$(hostname -i) RELEASE_NAME=selenium \
+	SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh DeploymentAutoscaling
 
 chart_test_autoscaling_job_https:
-	SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_PORT=443 \
+	SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https CHART_ENABLE_BASIC_AUTH=true RELEASE_NAME=selenium SELENIUM_GRID_PORT=443 SUB_PATH=/ \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh JobAutoscaling
 
@@ -612,7 +629,7 @@ chart_test_autoscaling_job_hostname:
 	./tests/charts/make/chart_test.sh JobAutoscaling
 
 chart_test_autoscaling_job:
-	CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true \
+	CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true SELENIUM_GRID_HOST=selenium-grid.local RELEASE_NAME=selenium SUB_PATH=/ \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh JobAutoscaling
 

NodeChrome/Dockerfile

@@ -59,7 +59,7 @@ USER ${SEL_UID}
 # Dumping Browser information for config
 #============================================
 RUN echo "chrome" > /opt/selenium/browser_name
-RUN google-chrome --version | awk '{print $3}' > /opt/selenium/browser_version
+RUN google-chrome --version | awk '{print $3}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
 RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/google-chrome\"}" > /opt/selenium/browser_binary_location
 
 ENV SE_OTEL_SERVICE_NAME "selenium-node-chrome"