File tree Expand file tree Collapse file tree 5 files changed +14
-26
lines changed Expand file tree Collapse file tree 5 files changed +14
-26
lines changed Original file line number Diff line number Diff line change @@ -83,11 +83,10 @@ jobs:
8383 AUTHORS : ${{ vars.AUTHORS || 'SeleniumHQ' }}
8484 - name : Sets prerelease to false by default
8585 run : echo "PRERELEASE=false" >> $GITHUB_ENV
86- - name : Build base image to get Grid version
87- run : VERSION="local" BUILD_DATE=${BUILD_DATE} make base
8886 - name : Get Grid version
89- # sed used to remove last comma of Selenium version output
90- run : echo "GRID_VERSION=$(docker run --rm ${NAME}/base:local-${BUILD_DATE} java -jar /opt/selenium/selenium-server.jar hub --version | awk '{print $3}' | sed 's/\(.*\),/\1 /')" | awk '{$1=$1;print}' >> $GITHUB_ENV
87+ run : |
88+ echo ${BASE_VERSION}
89+ echo "GRID_VERSION=${BASE_VERSION}" >> $GITHUB_ENV
9190 - name : Is it a prerelease?
9291 run : echo "GRID_VERSION=${GRID_VERSION}-prerelease" >> $GITHUB_ENV && echo "PRERELEASE=true" >> $GITHUB_ENV
9392 if : contains(toJson(github.event.commits), '[prerelease]') == true
Original file line number Diff line number Diff line change @@ -133,18 +133,6 @@ jobs:
133133 retry_wait_seconds : 60
134134 command : |
135135 VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
136- - name : Pre-build to reduce logs in test phase
137- uses : nick-invision/retry@master
138- if : matrix.build-all != true
139- with :
140- timeout_minutes : 30
141- max_attempts : 3
142- retry_wait_seconds : 60
143- command : |
144- VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make hub
145- VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chrome
146- VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make firefox
147- VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make edge
148136 - name : Set test parameters
149137 if : (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
150138 run : |
Original file line number Diff line number Diff line change @@ -63,16 +63,13 @@ jobs:
6363 env :
6464 NAMESPACE : ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
6565 AUTHORS : ${{ vars.AUTHORS || 'SeleniumHQ' }}
66- - name : Build base image to get Grid version
67- run : VERSION="local" BUILD_DATE=${BUILD_DATE} make base
6866 - name : Get Grid version
69- # sed used to remove last comma of Selenium version output
7067 run : |
71- echo "GRID_VERSION=$(docker run --rm ${NAME}/base:local-${BUILD_DATE} java -jar /opt/selenium/selenium-server.jar hub --version | awk '{print $3}' | sed 's/\(.*\),/\1 /')" | awk '{$1=$1;print}' >> $GITHUB_ENV
68+ echo ${BASE_VERSION}
69+ echo "GRID_VERSION=${BASE_VERSION}" >> $GITHUB_ENV
7270 - name : Display Grid version and set Base version
7371 run : |
7472 echo ${GRID_VERSION}
75- echo "BASE_VERSION=$(echo ${GRID_VERSION})" >> $GITHUB_ENV
7673 echo "BASE_RELEASE=nightly" >> $GITHUB_ENV
7774 - name : Update tag nightly
7875 uses :
richardsimko/[email protected]
Original file line number Diff line number Diff line change @@ -932,7 +932,7 @@ chart_test_autoscaling_deployment:
932932 ./tests/charts/make/chart_test.sh DeploymentAutoscaling
933933
934934chart_test_autoscaling_job_https :
935- PLATFORMS=$(PLATFORMS ) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_MONITORING=false SCALING_STRATEGY=accurate \
935+ PLATFORMS=$(PLATFORMS ) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_MONITORING=false \
936936 SECURE_CONNECTION_SERVER=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 SUB_PATH=/ \
937937 MAX_SESSIONS_FIREFOX=1 MAX_SESSIONS_EDGE=2 MAX_SESSIONS_CHROME=3 TEST_NAME_OVERRIDE=true \
938938 VERSION=$(TAG_VERSION ) VIDEO_TAG=$(FFMPEG_TAG_VERSION ) -$(BUILD_DATE ) KEDA_BASED_NAME=$(KEDA_BASED_NAME ) KEDA_BASED_TAG=$(KEDA_BASED_TAG ) NAMESPACE=$(NAMESPACE ) BINDING_VERSION=$(BINDING_VERSION ) BASE_VERSION=$(BASE_VERSION ) EXTERNAL_UPLOADER_CONFIG=true \
@@ -954,7 +954,7 @@ chart_test_autoscaling_job:
954954 ./tests/charts/make/chart_test.sh JobAutoscaling
955955
956956chart_test_autoscaling_playwright_connect_grid :
957- PLATFORMS=$(PLATFORMS ) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests SCALING_STRATEGY=accurate \
957+ PLATFORMS=$(PLATFORMS ) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests \
958958 BASIC_AUTH_USERNAME=docker-selenium BASIC_AUTH_PASSWORD=2NMI4jdBi6k7bENoeUfV25295VvzwAE9chM24a+2VL95uOHozo \
959959 SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i ) SELENIUM_GRID_PORT=443 \
960960 VERSION=$(TAG_VERSION ) VIDEO_TAG=$(FFMPEG_TAG_VERSION ) -$(BUILD_DATE ) KEDA_BASED_NAME=$(KEDA_BASED_NAME ) KEDA_BASED_TAG=$(KEDA_BASED_TAG ) NAMESPACE=$(NAMESPACE ) BINDING_VERSION=$(BINDING_VERSION ) BASE_VERSION=$(BASE_VERSION ) \
Original file line number Diff line number Diff line change @@ -83,11 +83,15 @@ elif [ "${CLUSTER}" = "minikube" ]; then
8383 rm -rf minikube-linux-$( dpkg --print-architecture)
8484 echo " ==============================="
8585 echo " Installing Go"
86- GO_VERSION=" 1.23.2 "
86+ GO_VERSION=" 1.23.3 "
8787 curl -sLO https://go.dev/dl/go$GO_VERSION .linux-$( dpkg --print-architecture) .tar.gz
88- sudo tar -xf go$GO_VERSION .linux-$( dpkg --print-architecture) .tar.gz -C /usr/local
88+ tar -xvf go$GO_VERSION .linux-$( dpkg --print-architecture) .tar.gz -C /tmp
8989 rm -rf go$GO_VERSION .linux-$( dpkg --print-architecture) .tar.gz*
90- sudo ln -sf /usr/local/go/bin/go /usr/bin/go
90+ sudo mv /tmp/go /usr/local
91+ export GOROOT=/usr/local/go
92+ export GOPATH=$HOME /go
93+ export PATH=$GOPATH /bin:$GOROOT /bin:$PATH
94+ source $HOME /.profile || source $HOME /.bashrc
9195 go version
9296 echo " ==============================="
9397 echo " Installing CRI-CTL (CLI for CRI-compatible container runtimes)"
You can’t perform that action at this time.
0 commit comments