Skip to content

Commit 05aa6a6

Browse files
authored
Merge branch 'trunk' into python
2 parents 4ee5aed + b42ce9c commit 05aa6a6

File tree

228 files changed

+4759
-1417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+4759
-1417
lines changed

.ffmpeg/Dockerfile

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
FROM ubuntu:noble AS builder
2-
ARG FFMPEG_VERSION="7.1"
3-
ARG RCLONE_VER="v1.69.0"
2+
ARG FFMPEG_VERSION="7.1.1"
3+
ARG RCLONE_VER="v1.69.1"
44
ARG GO_VERSION="latest"
5+
ARG GO_CRYPTO_VERSION="v0.35.0"
6+
ARG GO_OAUTH2_VERSION="v0.27.0"
7+
ARG GO_NET_VERSION="v0.36.0"
58

69
USER root
710

@@ -28,13 +31,14 @@ RUN if [ "${GO_VERSION}" = "latest" ]; then \
2831
&& go version
2932

3033
RUN cd /usr/local/src \
31-
&& git clone https://github.com/rclone/rclone.git \
34+
&& git clone https://github.com/rclone/rclone.git --filter=blob:none \
3235
&& cd rclone \
3336
&& git checkout ${RCLONE_VER} \
3437
# Patch deps version in go.mod to fix CVEs
35-
# && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
36-
# && sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
37-
# && go mod tidy \
38+
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
39+
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
40+
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
41+
&& go mod tidy \
3842
# Build rclone
3943
&& make \
4044
&& mv ~/go/bin/rclone /usr/local/bin/ \
@@ -44,7 +48,7 @@ RUN cd /usr/local/src \
4448
# Install x264 from source
4549
#======================================
4650
RUN cd /usr/local/src \
47-
&& git clone https://code.videolan.org/videolan/x264.git \
51+
&& git clone https://code.videolan.org/videolan/x264.git --filter=blob:none \
4852
&& cd x264 \
4953
&& ./configure --prefix="/usr/local" --enable-static \
5054
&& make \
@@ -54,9 +58,9 @@ RUN cd /usr/local/src \
5458
# Install FFmpeg from source
5559
#======================================
5660
RUN cd /usr/local/src \
57-
&& git clone https://github.com/FFmpeg/FFmpeg.git \
61+
&& git clone https://github.com/FFmpeg/FFmpeg.git --filter=blob:none \
5862
&& cd FFmpeg \
59-
&& git checkout release/${FFMPEG_VERSION} \
63+
&& git checkout n${FFMPEG_VERSION} \
6064
&& rm -rf .git \
6165
&& PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" FFMPEG_VERSION=${FFMPEG_VERSION} ./configure \
6266
--prefix="/usr/local" \

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
attributes:
5757
label: Docker Selenium version (image tag)
5858
description: What version of Docker Selenium are you using?
59-
placeholder: 4.28.1-20250202? Please use the full tag, avoid "latest"
59+
placeholder: 4.29.0-20250303? Please use the full tag, avoid "latest"
6060
validations:
6161
required: true
6262
- type: input

.github/workflows/build-ffmpeg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
jobs:
2121
deploy:
2222
name: Build and Deploy FFmpeg
23-
runs-on: blacksmith-8vcpu-ubuntu-2204
23+
runs-on: ubuntu-24.04
2424
permissions: write-all
2525
steps:
2626
- name: Checkout code

.github/workflows/build-test.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,23 @@ on:
1313
required: false
1414
type: string
1515
default: 'false'
16+
test-patched-keda:
17+
description: 'Test patched KEDA (true/false)'
18+
required: false
19+
default: ''
20+
type: string
1621
workflow_dispatch:
1722
inputs:
1823
rerunFailedOnly:
1924
description: 'Rerun only failed jobs'
2025
required: false
2126
type: boolean
2227
default: true
28+
test-patched-keda:
29+
description: 'Test patched KEDA (true/false)'
30+
required: false
31+
default: ''
32+
type: string
2333
push:
2434
branches:
2535
- trunk
@@ -58,6 +68,7 @@ jobs:
5868
secrets: inherit
5969
with:
6070
release: ${{ inputs.release == 'true' }}
71+
test-patched-keda: ${{ github.event.inputs.test-patched-keda }}
6172

6273
rerun-workflow-when-failure:
6374
name: Rerun workflow when failure

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- build-test
5252
if: (contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
5353
name: Deploy and Release
54-
runs-on: blacksmith-8vcpu-ubuntu-2204
54+
runs-on: ubuntu-24.04
5555
permissions: write-all
5656
steps:
5757
- name: Free Disk Space (Ubuntu)

.github/workflows/docker-test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,19 +172,22 @@ jobs:
172172
- name: Format and lint scripts
173173
run: |
174174
make format_shell_scripts
175+
- name: Disable QEMU
176+
if: matrix.test-strategy == 'test_node_relay' && contains(matrix.os, 'amd') == true
177+
run: echo "DOCKER_ENABLE_QEMU=false >> $GITHUB_ENV"
175178
- name: Set up containerd image store feature
176179
uses: nick-invision/retry@master
177180
with:
178181
timeout_minutes: 10
179182
max_attempts: 3
180183
command: |
181-
make setup_dev_env
184+
DOCKER_ENABLE_QEMU=${DOCKER_ENABLE_QEMU} make setup_dev_env
182185
- name: Output Docker info
183186
run: docker info
184187
- name: Set up Python
185188
uses: actions/setup-python@main
186189
with:
187-
python-version: '3.11'
190+
python-version: '3.13'
188191
check-latest: true
189192
- name: Enable KVM
190193
if: matrix.test-strategy == 'test_node_relay' && contains(matrix.os, 'arm') == false

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

Lines changed: 59 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
required: false
1414
type: string
1515
default: 'false'
16+
test-patched-keda:
17+
description: 'Test patched KEDA (true/false)'
18+
required: false
19+
default: ''
20+
type: string
1621
workflow_dispatch:
1722
inputs:
1823
request-timeout:
@@ -27,6 +32,11 @@ on:
2732
description: 'Test parameter for different log level'
2833
required: false
2934
default: 'FINE'
35+
test-patched-keda:
36+
description: 'Test patched KEDA (true/false)'
37+
required: false
38+
default: ''
39+
type: string
3040

3141
permissions:
3242
contents: read
@@ -40,68 +50,85 @@ jobs:
4050
matrix:
4151
include:
4252
- k8s-version: 'v1.26.15'
43-
test-strategy: disabled
4453
cluster: 'minikube'
4554
helm-version: 'v3.11.3'
4655
docker-version: '26.1.4'
47-
python-version: '3.8'
56+
python-version: '3.9'
4857
test-upgrade: true
4958
service-mesh: false
50-
os: ubuntu-24.04
59+
os: ubuntu-22.04
60+
check-records-output: true
61+
test-strategy: disabled
5162
- k8s-version: 'v1.27.16'
52-
test-strategy: job
5363
cluster: 'minikube'
5464
helm-version: 'v3.12.3'
5565
docker-version: '26.1.4'
5666
python-version: '3.9'
5767
test-upgrade: true
5868
service-mesh: true
59-
os: ubuntu-24.04
69+
os: ubuntu-22.04
70+
check-records-output: true
71+
test-strategy: job
6072
- k8s-version: 'v1.28.15'
61-
test-strategy: deployment
6273
cluster: 'minikube'
6374
helm-version: 'v3.13.3'
6475
docker-version: '26.1.4'
6576
python-version: '3.10'
6677
test-upgrade: true
6778
service-mesh: true
68-
os: ubuntu-24.04
69-
- k8s-version: 'v1.29.13'
70-
test-strategy: job_https
79+
os: ubuntu-22.04
80+
check-records-output: true
81+
test-strategy: deployment
82+
- k8s-version: 'v1.29.15'
7183
cluster: 'minikube'
7284
helm-version: 'v3.14.3'
73-
docker-version: '26.1.4'
85+
docker-version: '27.5.1'
7486
python-version: '3.11'
7587
test-upgrade: true
7688
service-mesh: false
77-
os: ubuntu-24.04
78-
- k8s-version: 'v1.30.9'
79-
test-strategy: job_hostname
89+
os: ubuntu-22.04
90+
check-records-output: true
91+
test-strategy: job_https
92+
- k8s-version: 'v1.30.11'
8093
cluster: 'minikube'
8194
helm-version: 'v3.15.4'
82-
docker-version: '26.1.4'
95+
docker-version: '27.5.1'
8396
python-version: '3.12'
8497
test-upgrade: true
8598
service-mesh: false
86-
os: ubuntu-24.04
87-
- k8s-version: 'v1.31.5'
88-
test-strategy: deployment_https
99+
os: ubuntu-22.04
100+
check-records-output: true
101+
test-strategy: job_hostname
102+
- k8s-version: 'v1.31.7'
89103
cluster: 'minikube'
90104
helm-version: 'v3.16.4'
91105
docker-version: '27.4.1'
92106
python-version: '3.13'
93107
test-upgrade: true
94108
service-mesh: false
95-
os: ubuntu-24.04
96-
- k8s-version: 'v1.32.1'
109+
os: ubuntu-22.04
110+
check-records-output: true
111+
test-strategy: deployment_https
112+
- k8s-version: 'v1.32.3'
113+
cluster: 'minikube'
114+
helm-version: 'v3.17.0'
115+
docker-version: '26.1.4'
116+
python-version: '3.10'
117+
test-upgrade: true
118+
service-mesh: true
119+
os: ubuntu-22.04
120+
check-records-output: true
97121
test-strategy: playwright_connect_grid
122+
- k8s-version: 'v1.32.3'
98123
cluster: 'minikube'
99124
helm-version: 'v3.17.0'
100125
docker-version: '26.1.4'
101126
python-version: '3.10'
102127
test-upgrade: true
103128
service-mesh: true
104-
os: ubuntu-24.04
129+
os: ubuntu-22.04
130+
check-records-output: false
131+
test-strategy: job_relay
105132
env:
106133
CLUSTER: ${{ matrix.cluster }}
107134
KUBERNETES_VERSION: ${{ matrix.k8s-version }}
@@ -110,6 +137,11 @@ jobs:
110137
DOCKER_VERSION: ${{ matrix.docker-version }}
111138
TEST_UPGRADE_CHART: ${{ matrix.test-upgrade }}
112139
SERVICE_MESH: ${{ matrix.service-mesh }}
140+
CHECK_RECORD_OUTPUT: ${{ matrix.check-records-output }}
141+
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
142+
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
143+
SAUCE_REGION: ${{ secrets.SAUCE_REGION }}
144+
TEST_PATCHED_KEDA: ${{ github.event.inputs.test-patched-keda }}
113145
steps:
114146
- name: Free Disk Space (Ubuntu)
115147
uses: jlumbroso/free-disk-space@main
@@ -200,8 +232,13 @@ jobs:
200232
timeout_minutes: 30
201233
max_attempts: 3
202234
command: |
203-
NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${{ matrix.test-strategy }} \
204-
&& NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make test_video_integrity
235+
NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${{ matrix.test-strategy }}
236+
exit_code=$?
237+
if [[ "${CHECK_RECORD_OUTPUT}" = "true" ]] && [[ "${exit_code}" -eq 0 ]]; then
238+
NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make test_video_integrity
239+
exit_code=$?
240+
fi
241+
exit ${exit_code}
205242
- name: Upload Helm chart package
206243
if: always()
207244
uses: actions/upload-artifact@main

0 commit comments

Comments
 (0)