From 4418ab49155a183718e397866d500c2ef855d4fc Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Wed, 27 Nov 2024 07:57:01 +0700 Subject: [PATCH] [ci] Update workflows Signed-off-by: Viet Nguyen Duc --- .github/workflows/deploy.yml | 7 +++---- .github/workflows/docker-test.yml | 12 ------------ .github/workflows/nightly.yml | 7 ++----- Makefile | 4 ++-- tests/charts/make/chart_setup_env.sh | 10 +++++++--- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0ef87cc53b..94528345e0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -83,11 +83,10 @@ jobs: AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }} - name: Sets prerelease to false by default run: echo "PRERELEASE=false" >> $GITHUB_ENV - - name: Build base image to get Grid version - run: VERSION="local" BUILD_DATE=${BUILD_DATE} make base - name: Get Grid version - # sed used to remove last comma of Selenium version output - 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 + run: | + echo ${BASE_VERSION} + echo "GRID_VERSION=${BASE_VERSION}" >> $GITHUB_ENV - name: Is it a prerelease? run: echo "GRID_VERSION=${GRID_VERSION}-prerelease" >> $GITHUB_ENV && echo "PRERELEASE=true" >> $GITHUB_ENV if: contains(toJson(github.event.commits), '[prerelease]') == true diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 9355884823..966aa9efe6 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -133,18 +133,6 @@ jobs: retry_wait_seconds: 60 command: | VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build - - name: Pre-build to reduce logs in test phase - uses: nick-invision/retry@master - if: matrix.build-all != true - with: - timeout_minutes: 30 - max_attempts: 3 - retry_wait_seconds: 60 - command: | - 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: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b1c79662b5..454083bbfa 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -63,16 +63,13 @@ jobs: env: NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }} AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }} - - name: Build base image to get Grid version - run: VERSION="local" BUILD_DATE=${BUILD_DATE} make base - name: Get Grid version - # sed used to remove last comma of Selenium version output 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 + echo ${BASE_VERSION} + echo "GRID_VERSION=${BASE_VERSION}" >> $GITHUB_ENV - name: Display Grid version and set Base version run: | echo ${GRID_VERSION} - echo "BASE_VERSION=$(echo ${GRID_VERSION})" >> $GITHUB_ENV echo "BASE_RELEASE=nightly" >> $GITHUB_ENV - name: Update tag nightly uses: richardsimko/update-tag@v1.0.11 diff --git a/Makefile b/Makefile index f9e6dc48e9..a2384f977b 100644 --- a/Makefile +++ b/Makefile @@ -932,7 +932,7 @@ chart_test_autoscaling_deployment: ./tests/charts/make/chart_test.sh DeploymentAutoscaling chart_test_autoscaling_job_https: - PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_MONITORING=false SCALING_STRATEGY=accurate \ + PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_MONITORING=false \ SECURE_CONNECTION_SERVER=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 SUB_PATH=/ \ MAX_SESSIONS_FIREFOX=1 MAX_SESSIONS_EDGE=2 MAX_SESSIONS_CHROME=3 TEST_NAME_OVERRIDE=true \ 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: ./tests/charts/make/chart_test.sh JobAutoscaling chart_test_autoscaling_playwright_connect_grid: - PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests SCALING_STRATEGY=accurate \ + PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests \ BASIC_AUTH_USERNAME=docker-selenium BASIC_AUTH_PASSWORD=2NMI4jdBi6k7bENoeUfV25295VvzwAE9chM24a+2VL95uOHozo \ SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 \ 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) \ diff --git a/tests/charts/make/chart_setup_env.sh b/tests/charts/make/chart_setup_env.sh index 3f543a793e..a319e50db2 100755 --- a/tests/charts/make/chart_setup_env.sh +++ b/tests/charts/make/chart_setup_env.sh @@ -83,11 +83,15 @@ elif [ "${CLUSTER}" = "minikube" ]; then rm -rf minikube-linux-$(dpkg --print-architecture) echo "===============================" echo "Installing Go" - GO_VERSION="1.23.2" + GO_VERSION="1.23.3" curl -sLO https://go.dev/dl/go$GO_VERSION.linux-$(dpkg --print-architecture).tar.gz - sudo tar -xf go$GO_VERSION.linux-$(dpkg --print-architecture).tar.gz -C /usr/local + tar -xvf go$GO_VERSION.linux-$(dpkg --print-architecture).tar.gz -C /tmp rm -rf go$GO_VERSION.linux-$(dpkg --print-architecture).tar.gz* - sudo ln -sf /usr/local/go/bin/go /usr/bin/go + sudo mv /tmp/go /usr/local + export GOROOT=/usr/local/go + export GOPATH=$HOME/go + export PATH=$GOPATH/bin:$GOROOT/bin:$PATH + source $HOME/.profile || source $HOME/.bashrc go version echo "===============================" echo "Installing CRI-CTL (CLI for CRI-compatible container runtimes)"