Skip to content

Commit 7b18a8f

Browse files
committed
update: env var SE_VIDEO_INTERNAL_UPLOAD is true by default
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent deb9d30 commit 7b18a8f

11 files changed

+8
-15
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ jobs:
167167
run: |
168168
git config --local user.email "[email protected]"
169169
git config --local user.name "Selenium CI Bot"
170-
git commit -m "Update tag in docs and files" -a
170+
git commit -m "Update tag ${RELEASE_TAG} in docs and files" -a
171+
env:
172+
RELEASE_TAG: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"
171173
- name: Push changes
172174
if: env.LATEST_TAG != env.NEXT_TAG && github.event.inputs.skip-commit != 'true'
173175
uses: ad-m/github-push-action@master

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ jobs:
8888
timeout_minutes: 20
8989
max_attempts: 3
9090
retry_wait_seconds: 120
91-
command: make chart_release
91+
command: |
92+
make chart_release
93+
echo "LATEST_CHART_VERSION=$(cat /tmp/latest_chart_version)" >> $GITHUB_ENV
9294
9395
- name: Run chart-releaser
9496
if: env.IS_RELEASE == 'true'
@@ -105,7 +107,7 @@ jobs:
105107
run: |
106108
git config --local user.email "[email protected]"
107109
git config --local user.name "Selenium CI Bot"
108-
git commit -m "Update chart changelog [skip ci]" -a || true
110+
git commit -m "Update chart ${LATEST_CHART_VERSION} changelog [skip ci]" -a || true
109111
110112
- name: Push changes
111113
if: github.event.inputs.skip-commit != 'true'

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ services:
671671
- DISPLAY_CONTAINER_NAME=chrome
672672
- SE_VIDEO_FILE_NAME=auto
673673
- SE_VIDEO_UPLOAD_ENABLED=true
674-
- SE_VIDEO_INTERNAL_UPLOAD=true
675674
- SE_UPLOAD_DESTINATION_PREFIX=s3://mybucket/path
676675
- RCLONE_CONFIG_S3_TYPE=s3
677676
- RCLONE_CONFIG_S3_PROVIDER=GCS

docker-compose-v3-video-upload-dynamic-grid.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ services:
3131
- SE_VIDEO_FILE_NAME=auto
3232
- SE_VIDEO_FILE_NAME_SUFFIX=true
3333
- SE_VIDEO_UPLOAD_ENABLED=true
34-
- SE_VIDEO_INTERNAL_UPLOAD=true
3534
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
3635
# All configs required for RCLONE to upload to remote name myftp with prefix SE_
3736
- SE_RCLONE_CONFIG_MYFTP_TYPE=ftp

docker-compose-v3-video-upload-standalone.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ services:
5858
- DISPLAY_CONTAINER_NAME=standalone_chrome
5959
- SE_VIDEO_FILE_NAME=auto
6060
- SE_VIDEO_UPLOAD_ENABLED=true
61-
- SE_VIDEO_INTERNAL_UPLOAD=true
6261
# Remote name and destination path to upload
6362
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
6463
# All configs required for RCLONE to upload to remote name myftp
@@ -83,7 +82,6 @@ services:
8382
- DISPLAY_CONTAINER_NAME=standalone_edge
8483
- SE_VIDEO_FILE_NAME=auto
8584
- SE_VIDEO_UPLOAD_ENABLED=true
86-
- SE_VIDEO_INTERNAL_UPLOAD=true
8785
# Remote name and destination path to upload
8886
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
8987
# All configs required for RCLONE to upload to remote name myftp
@@ -108,7 +106,6 @@ services:
108106
- DISPLAY_CONTAINER_NAME=standalone_firefox
109107
- SE_VIDEO_FILE_NAME=auto
110108
- SE_VIDEO_UPLOAD_ENABLED=true
111-
- SE_VIDEO_INTERNAL_UPLOAD=true
112109
# Remote name and destination path to upload
113110
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
114111
# All configs required for RCLONE to upload to remote name myftp

docker-compose-v3-video-upload.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ services:
5555
- SE_NODE_GRID_URL=http://selenium-hub:4444
5656
- SE_VIDEO_FILE_NAME=auto
5757
- SE_VIDEO_UPLOAD_ENABLED=true
58-
- SE_VIDEO_INTERNAL_UPLOAD=true
5958
# Remote name and destination path to upload
6059
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
6160
# All configs required for RCLONE to upload to remote name myftp
@@ -76,7 +75,6 @@ services:
7675
- SE_NODE_GRID_URL=http://selenium-hub:4444
7776
- SE_VIDEO_FILE_NAME=auto
7877
- SE_VIDEO_UPLOAD_ENABLED=true
79-
- SE_VIDEO_INTERNAL_UPLOAD=true
8078
# Remote name and destination path to upload
8179
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
8280
# All configs required for RCLONE to upload to remote name myftp
@@ -97,7 +95,6 @@ services:
9795
- SE_NODE_GRID_URL=http://selenium-hub:4444
9896
- SE_VIDEO_FILE_NAME=auto
9997
- SE_VIDEO_UPLOAD_ENABLED=true
100-
- SE_VIDEO_INTERNAL_UPLOAD=true
10198
# Remote name and destination path to upload
10299
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
103100
# All configs required for RCLONE to upload to remote name myftp

tests/charts/make/chart_release.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ NAMESPACE=${NAMESPACE:-"selenium"}
55
# Function to be executed on command failure
66

77
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:]')
8+
echo "${latest_chart_version}" > /tmp/latest_chart_version
89
helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version}
910
if [[ $? -eq 0 ]]; then
1011
echo "Chart version $latest_chart_version is already available in the registry"

tests/docker-compose-v3-test-node-docker.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ services:
2929
- SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME}
3030
- SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}
3131
- SE_VIDEO_UPLOAD_ENABLED=true
32-
- SE_VIDEO_INTERNAL_UPLOAD=true
3332
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
3433
- SE_RCLONE_CONFIG_MYFTP_TYPE=ftp
3534
- SE_RCLONE_CONFIG_MYFTP_HOST=ftp_server

tests/docker-compose-v3-test-standalone-docker.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ services:
1919
- SE_VIDEO_FILE_NAME=${VIDEO_FILE_NAME}
2020
- SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}
2121
- SE_VIDEO_UPLOAD_ENABLED=true
22-
- SE_VIDEO_INTERNAL_UPLOAD=true
2322
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
2423
- SE_RCLONE_CONFIG_MYFTP_TYPE=ftp
2524
- SE_RCLONE_CONFIG_MYFTP_HOST=ftp_server

tests/docker-compose-v3-test-standalone.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ services:
4242
- SE_VIDEO_FILE_NAME_SUFFIX=${VIDEO_FILE_NAME_SUFFIX}
4343
- SE_SUPERVISORD_LOG_LEVEL=error
4444
- SE_VIDEO_UPLOAD_ENABLED=true
45-
- SE_VIDEO_INTERNAL_UPLOAD=true
4645
- SE_UPLOAD_DESTINATION_PREFIX=myftp://ftp/seluser
4746
- RCLONE_CONFIG_MYFTP_TYPE=ftp
4847
- RCLONE_CONFIG_MYFTP_HOST=ftp_server

0 commit comments

Comments
 (0)