Skip to content

Commit c61bd76

Browse files
VietND96VietND96
committed
Merge remote-tracking branch 'origin/trunk' into list-env-vars
Signed-off-by: Viet Nguyen Duc <[email protected]>
2 parents 8475efc + 2321338 commit c61bd76

30 files changed

+284
-247
lines changed

‎.circleci/config.yml‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ workflows:
4747
name: "K8s test - Autoscaling Jobs - HTTPS"
4848
platforms: linux/arm64
4949
machine-type: ubuntu2204arm64large
50-
k8s-version: 'v1.29.10'
50+
k8s-version: 'v1.29.12'
5151
test-strategy: job_https
5252
cluster: 'minikube'
5353
helm-version: 'v3.14.3'
@@ -57,7 +57,7 @@ workflows:
5757
name: "K8s test - Autoscaling Jobs - Ingress hostname"
5858
platforms: linux/arm64
5959
machine-type: ubuntu2204arm64large
60-
k8s-version: 'v1.30.6'
60+
k8s-version: 'v1.30.8'
6161
test-strategy: job_hostname
6262
cluster: 'minikube'
6363
helm-version: 'v3.15.4'
@@ -67,11 +67,11 @@ workflows:
6767
name: "K8s test - Autoscaling Deployments - HTTPS"
6868
platforms: linux/arm64
6969
machine-type: ubuntu2204arm64large
70-
k8s-version: 'v1.31.2'
70+
k8s-version: 'v1.31.4'
7171
test-strategy: deployment_https
7272
cluster: 'minikube'
73-
helm-version: 'v3.16.3'
74-
docker-version: '27.3.1'
73+
helm-version: 'v3.16.4'
74+
docker-version: '27.4.1'
7575
test-upgrade: true
7676
- docker-test:
7777
name: "Docker test - Use random user (true)"
@@ -134,8 +134,8 @@ workflows:
134134
test-strategy: test_parallel
135135
use-random-user: false
136136
platforms: linux/arm64
137-
machine-type: ubuntu2204arm64
138-
firefox-install-lang-package: true
137+
machine-type: ubuntu2204arm64large
138+
firefox-install-lang-package: false
139139
enable-managed-downloads: true
140140
- docker-test:
141141
name: "Docker test - Node relay commands"
@@ -202,7 +202,7 @@ jobs:
202202
command: |
203203
N=3
204204
while [ $N -gt 0 ]; do
205-
output=$(eval "PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build")
205+
PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
206206
status=$?
207207
if [ $status -eq 0 ]; then
208208
echo "Build images passed"
@@ -213,26 +213,31 @@ jobs:
213213
sleep 10
214214
fi
215215
done
216-
exit 1
216+
exit $status
217217
- run:
218218
name: "Test Docker images"
219+
no_output_timeout: 60m
219220
command: |
220-
N=3
221-
while [ $N -gt 0 ]; do
222-
output=$(eval "USE_RANDOM_USER_ID=${USE_RANDOM_USER} PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} \
221+
max_iteration=3
222+
iteration=1
223+
until USE_RANDOM_USER_ID=${USE_RANDOM_USER} PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} \
223224
TEST_FIREFOX_INSTALL_LANG_PACKAGE=${TEST_FIREFOX_INSTALL_LANG_PACKAGE} SELENIUM_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS} \
224-
make ${TEST_STRATEGY}")
225-
status=$?
226-
if [ $status -eq 0 ]; then
227-
echo "Tests passed"
228-
exit 0
229-
else
230-
echo "Tests failed. Retrying..."
231-
N=$((N-1))
232-
sleep 10
225+
make ${TEST_STRATEGY} >& /dev/null; [[ $? -eq 0 ]];
226+
do
227+
echo "Result unsuccessful"
228+
if [[ $iteration -eq $max_iteration ]]
229+
then
230+
break
233231
fi
232+
sleep 1
233+
((iteration++))
234234
done
235-
exit 1
235+
if [[ $iteration -eq $max_iteration ]]
236+
then
237+
echo "All of the $max_iteration trials failed!!!"
238+
else
239+
echo "Result successful"
240+
fi
236241
237242
kubernetes-test:
238243
parameters:
@@ -263,6 +268,8 @@ jobs:
263268
HELM_VERSION: << parameters.helm-version >>
264269
DOCKER_VERSION: << parameters.docker-version >>
265270
TEST_UPGRADE_CHART: << parameters.test-upgrade >>
271+
TEST_MULTIPLE_VERSIONS: false
272+
TEST_MULTIPLE_PLATFORMS: false
266273
steps:
267274
- run:
268275
name: "Prepare workflow environment variables"
@@ -288,7 +295,7 @@ jobs:
288295
command: |
289296
N=3
290297
while [ $N -gt 0 ]; do
291-
output=$(eval "PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build")
298+
PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
292299
status=$?
293300
if [ $status -eq 0 ]; then
294301
echo "Build images passed"
@@ -299,7 +306,7 @@ jobs:
299306
sleep 10
300307
fi
301308
done
302-
exit 1
309+
exit $status
303310
- run:
304311
name: "Build Helm charts"
305312
command: |
@@ -309,28 +316,28 @@ jobs:
309316
source $BASH_ENV
310317
- run:
311318
name: "Test Selenium Grid on Kubernetes"
312-
no_output_timeout: 30m
319+
no_output_timeout: 60m
313320
command: |
314-
if [ "${TEST_STRATEGY}" == "playwright_connect_grid" ]; then
315-
PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity
316-
exit $?
317-
fi
318-
N=3
319-
while [ $N -gt 0 ]; do
320-
output=$(eval "PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity")
321-
status=$?
322-
if [ $status -eq 0 ]; then
323-
echo "${output}"
324-
echo "Tests passed"
325-
exit 0
326-
else
327-
echo "${output}"
328-
echo "Tests failed. Retrying..."
329-
N=$((N-1))
330-
sleep 10
321+
max_iteration=3
322+
iteration=1
323+
until PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false \
324+
TEST_MULTIPLE_VERSIONS=${TEST_MULTIPLE_VERSIONS} TEST_MULTIPLE_PLATFORMS=${TEST_MULTIPLE_PLATFORMS} \
325+
make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity >& /dev/null; [[ $? -eq 0 ]];
326+
do
327+
echo "Result unsuccessful"
328+
if [[ $iteration -eq $max_iteration ]]
329+
then
330+
break
331331
fi
332+
sleep 1
333+
((iteration++))
332334
done
333-
exit 1
335+
if [[ $iteration -eq $max_iteration ]]
336+
then
337+
echo "All of the $max_iteration trials failed!!!"
338+
else
339+
echo "Result successful"
340+
fi
334341
- run:
335342
name: "Clean-up Kubernetes environment"
336343
command: |

‎.github/workflows/build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- docker-test
6666
- helm-chart-test
6767
if: failure() && ( github.run_attempt < 3 )
68-
runs-on: ubuntu-latest
68+
runs-on: ubuntu-24.04
6969
steps:
7070
- name: Checkout code
7171
uses: actions/checkout@main

‎.github/workflows/docker-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929
jobs:
3030
build-and-test:
3131
name: Test Docker Selenium
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-24.04
3333
strategy:
3434
fail-fast: false
3535
matrix:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@ jobs:
3535
helm-chart-test:
3636
if: github.event.inputs.skip-test != 'true' && contains(toJson(github.event.commits), '[skip test]') == false
3737
uses: ./.github/workflows/helm-chart-test.yml
38+
secrets: inherit
3839
with:
3940
release: ${{ github.event.inputs.release == 'true' }}
4041

4142
release:
4243
needs:
4344
- helm-chart-test
4445
if: (!failure() && !cancelled())
45-
runs-on: ubuntu-latest
46+
runs-on: ubuntu-24.04
4647
permissions: write-all
4748
env:
4849
NAME: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ permissions:
3434
jobs:
3535
build-and-test:
3636
name: Test K8s
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-24.04
3838
strategy:
3939
fail-fast: false
4040
matrix:
@@ -43,55 +43,55 @@ jobs:
4343
test-strategy: playwright_connect_grid
4444
cluster: 'minikube'
4545
helm-version: 'v3.11.3'
46-
docker-version: '24.0.9'
46+
docker-version: '26.1.4'
4747
python-version: '3.8'
4848
test-upgrade: true
4949
service-mesh: true
5050
- k8s-version: 'v1.26.15'
5151
test-strategy: disabled
5252
cluster: 'minikube'
5353
helm-version: 'v3.11.3'
54-
docker-version: '24.0.9'
54+
docker-version: '26.1.4'
5555
python-version: '3.8'
5656
test-upgrade: true
5757
service-mesh: false
5858
- k8s-version: 'v1.27.16'
5959
test-strategy: job
6060
cluster: 'minikube'
6161
helm-version: 'v3.12.3'
62-
docker-version: '24.0.9'
62+
docker-version: '26.1.4'
6363
python-version: '3.9'
6464
test-upgrade: true
6565
service-mesh: true
6666
- k8s-version: 'v1.28.15'
6767
test-strategy: deployment
6868
cluster: 'minikube'
6969
helm-version: 'v3.13.3'
70-
docker-version: '24.0.9'
70+
docker-version: '26.1.4'
7171
python-version: '3.10'
7272
test-upgrade: true
7373
service-mesh: true
74-
- k8s-version: 'v1.29.10'
74+
- k8s-version: 'v1.29.12'
7575
test-strategy: job_https
7676
cluster: 'minikube'
7777
helm-version: 'v3.14.3'
78-
docker-version: '25.0.5'
78+
docker-version: '26.1.4'
7979
python-version: '3.11'
8080
test-upgrade: true
8181
service-mesh: false
82-
- k8s-version: 'v1.30.6'
82+
- k8s-version: 'v1.30.8'
8383
test-strategy: job_hostname
8484
cluster: 'minikube'
8585
helm-version: 'v3.15.4'
8686
docker-version: '26.1.4'
8787
python-version: '3.12'
8888
test-upgrade: true
8989
service-mesh: false
90-
- k8s-version: 'v1.31.2'
90+
- k8s-version: 'v1.31.4'
9191
test-strategy: deployment_https
9292
cluster: 'minikube'
93-
helm-version: 'v3.16.3'
94-
docker-version: '27.3.1'
93+
helm-version: 'v3.16.4'
94+
docker-version: '27.4.1'
9595
python-version: '3.13'
9696
test-upgrade: true
9797
service-mesh: false
@@ -213,7 +213,9 @@ jobs:
213213
uses: actions/upload-artifact@main
214214
with:
215215
name: ${{ env.ARTIFACT_NAME }}-videos
216-
path: ./tests/videos/
216+
path: |
217+
./tests/videos/
218+
!./tests/videos/**/*.hprof
217219
- name: Test chart upgrade
218220
if: (matrix.test-upgrade == true)
219221
run: |

‎.github/workflows/k8s-scaling-test.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,46 +56,46 @@ env:
5656
jobs:
5757
build-and-test:
5858
name: Test K8s
59-
runs-on: ubuntu-latest
59+
runs-on: ubuntu-24.04
6060
strategy:
6161
fail-fast: false
6262
matrix:
6363
include:
64-
- k8s-version: 'v1.31.2'
64+
- k8s-version: 'v1.31.4'
6565
test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
6666
cluster: 'minikube'
67-
helm-version: 'v3.16.3'
68-
docker-version: '27.3.1'
67+
helm-version: 'v3.16.4'
68+
docker-version: '27.4.1'
6969
python-version: '3.13'
70-
- k8s-version: 'v1.31.2'
70+
- k8s-version: 'v1.31.4'
7171
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
7272
cluster: 'minikube'
73-
helm-version: 'v3.16.3'
74-
docker-version: '27.3.1'
73+
helm-version: 'v3.16.4'
74+
docker-version: '27.4.1'
7575
python-version: '3.13'
76-
- k8s-version: 'v1.31.2'
76+
- k8s-version: 'v1.31.4'
7777
test-strategy: test_k8s_autoscaling_job_count_strategy_default
7878
cluster: 'minikube'
79-
helm-version: 'v3.16.3'
80-
docker-version: '27.3.1'
79+
helm-version: 'v3.16.4'
80+
docker-version: '27.4.1'
8181
python-version: '3.13'
82-
- k8s-version: 'v1.31.2'
82+
- k8s-version: 'v1.31.4'
8383
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
8484
cluster: 'minikube'
85-
helm-version: 'v3.16.3'
86-
docker-version: '27.3.1'
85+
helm-version: 'v3.16.4'
86+
docker-version: '27.4.1'
8787
python-version: '3.13'
88-
- k8s-version: 'v1.31.2'
88+
- k8s-version: 'v1.31.4'
8989
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
9090
cluster: 'minikube'
91-
helm-version: 'v3.16.3'
92-
docker-version: '27.3.1'
91+
helm-version: 'v3.16.4'
92+
docker-version: '27.4.1'
9393
python-version: '3.13'
94-
- k8s-version: 'v1.31.2'
94+
- k8s-version: 'v1.31.4'
9595
test-strategy: test_k8s_autoscaling_deployment_count
9696
cluster: 'minikube'
97-
helm-version: 'v3.16.3'
98-
docker-version: '27.3.1'
97+
helm-version: 'v3.16.4'
98+
docker-version: '27.4.1'
9999
python-version: '3.13'
100100
env:
101101
CLUSTER: ${{ matrix.cluster }}
@@ -197,7 +197,7 @@ jobs:
197197
publish-results:
198198
name: Publish Results
199199
if: (!failure() && !cancelled() && (github.event.inputs.publish-results == 'true'))
200-
runs-on: ubuntu-latest
200+
runs-on: ubuntu-24.04
201201
needs: build-and-test
202202
steps:
203203
- name: Checkout code
@@ -231,7 +231,7 @@ jobs:
231231
pr-results:
232232
name: Create a PR with the results
233233
if: (!failure() && !cancelled() && (github.event.inputs.pr-results == 'true'))
234-
runs-on: ubuntu-latest
234+
runs-on: ubuntu-24.04
235235
needs: build-and-test
236236
steps:
237237
- name: Checkout code

‎.github/workflows/label-commenter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
comment:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@main
1717
- name: Label Commenter

‎.github/workflows/lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
jobs:
1414
action:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: dessant/lock-threads@v5
1818
with:

0 commit comments

Comments
 (0)