diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1db32fbff..52c33b3a2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -167,7 +167,9 @@ jobs: run: | git config --local user.email "selenium-ci@users.noreply.github.com" git config --local user.name "Selenium CI Bot" - git commit -m "Update tag in docs and files" -a + git commit -m "Update tag ${RELEASE_TAG} in docs and files" -a + env: + RELEASE_TAG: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}" - name: Push changes if: env.LATEST_TAG != env.NEXT_TAG && github.event.inputs.skip-commit != 'true' uses: ad-m/github-push-action@master diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml index a988a908a..b0809e5f9 100644 --- a/.github/workflows/helm-chart-release.yml +++ b/.github/workflows/helm-chart-release.yml @@ -88,7 +88,9 @@ jobs: timeout_minutes: 20 max_attempts: 3 retry_wait_seconds: 120 - command: make chart_release + command: | + make chart_release + echo "LATEST_CHART_VERSION=$(cat /tmp/latest_chart_version)" >> $GITHUB_ENV - name: Run chart-releaser if: env.IS_RELEASE == 'true' @@ -105,7 +107,7 @@ jobs: run: | git config --local user.email "selenium-ci@users.noreply.github.com" git config --local user.name "Selenium CI Bot" - git commit -m "Update chart changelog [skip ci]" -a || true + git commit -m "Update chart ${LATEST_CHART_VERSION} changelog [skip ci]" -a || true - name: Push changes if: github.event.inputs.skip-commit != 'true' diff --git a/README.md b/README.md index 8a834f900..6ff1d62ae 100644 --- a/README.md +++ b/README.md @@ -671,7 +671,6 @@ services: - DISPLAY_CONTAINER_NAME=chrome - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=s3://mybucket/path - RCLONE_CONFIG_S3_TYPE=s3 - RCLONE_CONFIG_S3_PROVIDER=GCS diff --git a/docker-compose-v3-video-upload-dynamic-grid.yml b/docker-compose-v3-video-upload-dynamic-grid.yml index 0f591f1af..17afb26a5 100644 --- a/docker-compose-v3-video-upload-dynamic-grid.yml +++ b/docker-compose-v3-video-upload-dynamic-grid.yml @@ -31,7 +31,6 @@ services: - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_FILE_NAME_SUFFIX=true - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp with prefix SE_ - SE_RCLONE_CONFIG_MYFTP_TYPE=ftp diff --git a/docker-compose-v3-video-upload-standalone.yml b/docker-compose-v3-video-upload-standalone.yml index f7a0d8774..4e691744d 100644 --- a/docker-compose-v3-video-upload-standalone.yml +++ b/docker-compose-v3-video-upload-standalone.yml @@ -58,7 +58,6 @@ services: - DISPLAY_CONTAINER_NAME=standalone_chrome - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp @@ -83,7 +82,6 @@ services: - DISPLAY_CONTAINER_NAME=standalone_edge - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp @@ -108,7 +106,6 @@ services: - DISPLAY_CONTAINER_NAME=standalone_firefox - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp diff --git a/docker-compose-v3-video-upload.yml b/docker-compose-v3-video-upload.yml index 7772dc3e8..6ff2764b2 100644 --- a/docker-compose-v3-video-upload.yml +++ b/docker-compose-v3-video-upload.yml @@ -55,7 +55,6 @@ services: - SE_NODE_GRID_URL=http://selenium-hub:4444 - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp @@ -76,7 +75,6 @@ services: - SE_NODE_GRID_URL=http://selenium-hub:4444 - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp @@ -97,7 +95,6 @@ services: - SE_NODE_GRID_URL=http://selenium-hub:4444 - SE_VIDEO_FILE_NAME=auto - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true # Remote name and destination path to upload - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser # All configs required for RCLONE to upload to remote name myftp diff --git a/tests/charts/make/chart_release.sh b/tests/charts/make/chart_release.sh index 91a1da42d..332393374 100755 --- a/tests/charts/make/chart_release.sh +++ b/tests/charts/make/chart_release.sh @@ -5,6 +5,7 @@ NAMESPACE=${NAMESPACE:-"selenium"} # Function to be executed on command failure latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]') +echo "${latest_chart_version}" > /tmp/latest_chart_version helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version} if [[ $? -eq 0 ]]; then echo "Chart version $latest_chart_version is already available in the registry" diff --git a/tests/docker-compose-v3-test-node-docker.yaml b/tests/docker-compose-v3-test-node-docker.yaml index b974e2950..ff685d2ad 100644 --- a/tests/docker-compose-v3-test-node-docker.yaml +++ b/tests/docker-compose-v3-test-node-docker.yaml @@ -29,7 +29,6 @@ services: - SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME} - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX} - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser - SE_RCLONE_CONFIG_MYFTP_TYPE=ftp - SE_RCLONE_CONFIG_MYFTP_HOST=ftp_server diff --git a/tests/docker-compose-v3-test-standalone-docker.yaml b/tests/docker-compose-v3-test-standalone-docker.yaml index d0084b706..49e402460 100644 --- a/tests/docker-compose-v3-test-standalone-docker.yaml +++ b/tests/docker-compose-v3-test-standalone-docker.yaml @@ -19,7 +19,6 @@ services: - SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME} - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX} - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser - SE_RCLONE_CONFIG_MYFTP_TYPE=ftp - SE_RCLONE_CONFIG_MYFTP_HOST=ftp_server diff --git a/tests/docker-compose-v3-test-standalone.yml b/tests/docker-compose-v3-test-standalone.yml index deb3c105d..38d3d48e4 100644 --- a/tests/docker-compose-v3-test-standalone.yml +++ b/tests/docker-compose-v3-test-standalone.yml @@ -42,7 +42,6 @@ services: - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX} - SE_SUPERVISORD_LOG_LEVEL=error - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser - RCLONE_CONFIG_MYFTP_TYPE=ftp - RCLONE_CONFIG_MYFTP_HOST=ftp_server diff --git a/tests/docker-compose-v3-test-video.yml b/tests/docker-compose-v3-test-video.yml index ef89673e9..712dbfdf7 100644 --- a/tests/docker-compose-v3-test-video.yml +++ b/tests/docker-compose-v3-test-video.yml @@ -30,7 +30,6 @@ services: - SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX} - SE_SUPERVISORD_LOG_LEVEL=info - SE_VIDEO_UPLOAD_ENABLED=true - - SE_VIDEO_INTERNAL_UPLOAD=true - SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser - RCLONE_CONFIG_MYFTP_TYPE=ftp - RCLONE_CONFIG_MYFTP_HOST=ftp_server