Revert changes

Signed-off-by: Viet Nguyen Duc <[email protected]>
SeleniumHQ · Jan 21, 2025 · 70ef6c4 · 70ef6c4
1 parent fc257c2
commit 70ef6c4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/.github/actions/get-latest-upstream/action.yml b/.github/actions/get-latest-upstream/action.yml
@@ -16,22 +16,25 @@ runs:
   steps:
     - name: Get latest upstream
       shell: bash
+      env:
+        IS_RELEASE: ${{ github.event.inputs.release || 'true' }}
+        GH_CLI_TOKEN: ${{ inputs.gh_cli_token }}
       run: |
         sudo apt update
-        sudo apt install jq
-        AUTH_HEADER="Authorization: token ${{ inputs.gh_cli_token }}"
-        if [ "${{ inputs.release }}" = "true" ]; then
+        sudo apt install gh
+        echo "${GH_CLI_TOKEN}" | gh auth login --with-token
+        if [ "${IS_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=$(gh release list -R SeleniumHQ/selenium | grep -v nightly | awk '{ print $4 }' | head -1)
         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')
+          RELEASE=$(gh release list -R SeleniumHQ/selenium | grep nightly | awk '{ print $3 }' | head -1)
           if [ -z "${RELEASE}" ]; 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=$(gh release list -R SeleniumHQ/selenium | grep -v nightly | awk '{ print $4 }' | head -1)
           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=$(gh release view -R SeleniumHQ/selenium ${RELEASE} | grep jar | awk '{ print $2 }' | 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}"

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -12,7 +12,7 @@ on:
         description: 'Test a new release process'
         required: false
         type: string
-        default: 'false'
+        default: 'true'
   workflow_dispatch:
     inputs:
       rerunFailedOnly:
@@ -49,15 +49,15 @@ jobs:
     name: Test Selenium Grid on Docker
     uses: ./.github/workflows/docker-test.yml
     with:
-      release: ${{ inputs.release == 'true' }}
+      release: ${{ github.event.inputs.release || 'true' }}
 
   helm-chart-test:
     if: contains(toJson(github.event.commits), '[skip test]') == false
     name: Test Selenium Grid on Kubernetes
     uses: ./.github/workflows/helm-chart-test.yml
     secrets: inherit
     with:
-      release: ${{ inputs.release == 'true' }}
+      release: ${{ github.event.inputs.release || 'true' }}
 
   rerun-workflow-when-failure:
     name: Rerun workflow when failure

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -7,7 +7,7 @@ on:
         description: 'Test a new release process'
         required: false
         type: string
-        default: 'false'
+        default: 'true'
   workflow_dispatch:
     inputs:
       request-timeout:
@@ -207,7 +207,7 @@ jobs:
       - name: Set Selenium base version
         uses: ./.github/actions/get-latest-upstream
         with:
-          release: ${{ inputs.release || false }}
+          release: ${{ github.event.inputs.release || 'true' }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Sets build date
         run: |

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
@@ -42,7 +42,7 @@ jobs:
     uses: ./.github/workflows/helm-chart-test.yml
     secrets: inherit
     with:
-      release: ${{ github.event.inputs.release == 'true' }}
+      release: ${{ github.event.inputs.release || 'true' }}
 
   release:
     needs:

diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
@@ -12,7 +12,7 @@ on:
         description: 'Test a new release process'
         required: false
         type: string
-        default: 'false'
+        default: 'true'
   workflow_dispatch:
     inputs:
       request-timeout:
@@ -44,7 +44,7 @@ jobs:
             cluster: 'minikube'
             helm-version: 'v3.11.3'
             docker-version: '26.1.4'
-            python-version: '3.8'
+            python-version: '3.9'
             test-upgrade: true
             service-mesh: false
             os: ubuntu-24.04
@@ -149,7 +149,7 @@ jobs:
       - name: Set Selenium base version
         uses: ./.github/actions/get-latest-upstream
         with:
-          release: ${{ inputs.release || false }}
+          release: ${{ github.event.inputs.release || 'true' }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Sets build date
         run: |

diff --git a/.github/workflows/k8s-scaling-test.yml b/.github/workflows/k8s-scaling-test.yml
@@ -12,7 +12,7 @@ on:
         description: 'Test a new release process'
         required: false
         type: string
-        default: 'false'
+        default: 'true'
       push-results:
         description: 'Publish the results to the repository'
         required: false
@@ -139,7 +139,7 @@ jobs:
       - name: Set Selenium base version
         uses: ./.github/actions/get-latest-upstream
         with:
-          release: ${{ inputs.release || false }}
+          release: ${{ github.event.inputs.release || 'true' }}
           gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Sets build date
         run: |

diff --git a/Video/video.sh b/Video/video.sh
@@ -22,11 +22,11 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"%Y-%m-%d %H:%M:%S,%3N"}
 process_name="video.recorder"
 
 if [ "${SE_VIDEO_RECORD_STANDALONE}" = "true" ]; then
-  JQ_SESSION_ID_QUERY=".value.nodes[-1]?.slots[-1]?.session?.sessionId"
+  JQ_SESSION_ID_QUERY=".value.nodes[]?.slots[]?.session?.sessionId"
   SE_NODE_PORT=${SE_NODE_PORT:-"4444"}
   NODE_STATUS_ENDPOINT="$(/opt/bin/video_gridUrl.sh)/status"
 else
-  JQ_SESSION_ID_QUERY=".[-1]?.node?.slots | .[-1]?.session?.sessionId"
+  JQ_SESSION_ID_QUERY=".[]?.node?.slots | .[0]?.session?.sessionId"
   SE_NODE_PORT=${SE_NODE_PORT:-"5555"}
   NODE_STATUS_ENDPOINT="${SE_SERVER_PROTOCOL}://${DISPLAY_CONTAINER_NAME}:${SE_NODE_PORT}/status"
 fi
@@ -259,7 +259,7 @@ else
       fi
       echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
       sleep ${poll_interval}
-    elif [[ "$recording_started" = "true" && ("$session_id" != "$prev_session_id" || "$session_id" == "null" || "$session_id" == "") ]]; then
+    elif [[ "$session_id" != "$prev_session_id" && "$recording_started" = "true" ]]; then
       stop_recording
       wait_for_file_integrity
       if [[ $max_recorded_count -gt 0 ]] && [[ $recorded_count -ge $max_recorded_count ]]; then

diff --git a/Video/video_graphQLQuery.sh b/Video/video_graphQLQuery.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 max_time=1
-retry_time=2
+retry_time=3
 
 # Define parameters
 SESSION_ID=$1