Skip to content

Commit 77c2c97

Browse files
VietND96VietND96
committed
test: fetch binding version from Makefile
[deploy] Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
1 parent 2145033 commit 77c2c97

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

‎Makefile

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CURRENT_DATE := $(shell date '+%Y%m%d')
33
BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
44
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.19.0)
55
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.1)
6+
BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.19.0)
67
BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
78
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.20.0-SNAPSHOT)
89
VERSION := $(or $(VERSION),$(VERSION),4.19.1)
@@ -365,22 +366,22 @@ test: test_chrome \
365366

366367

367368
test_chrome:
368-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
369+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh NodeChrome
369370

370371
test_chrome_standalone:
371-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
372+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh StandaloneChrome
372373

373374
test_edge:
374-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeEdge
375+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh NodeEdge
375376

376377
test_edge_standalone:
377-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneEdge
378+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh StandaloneEdge
378379

379380
test_firefox:
380-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefox
381+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh NodeFirefox
381382

382383
test_firefox_standalone:
383-
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
384+
VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) ./tests/bootstrap.sh StandaloneFirefox
384385

385386
test_parallel: hub chrome firefox edge
386387
for node in DeploymentAutoscaling JobAutoscaling ; do \
@@ -392,6 +393,7 @@ test_parallel: hub chrome firefox edge
392393
echo REQUEST_TIMEOUT=$(or $(REQUEST_TIMEOUT), 300) >> .env ; \
393394
echo NODE=$$node >> .env ; \
394395
echo UID=$$(id -u) >> .env ; \
396+
echo BINDING_VERSION=$(BINDING_VERSION) >> .env ; \
395397
docker-compose -f docker-compose-v3-test-parallel.yml up --no-log-prefix --exit-code-from tests --build ; \
396398
done
397399

@@ -406,6 +408,7 @@ test_video: video hub chrome firefox edge
406408
echo TAG=$(TAG_VERSION) >> .env ; \
407409
echo NODE=$$node >> .env ; \
408410
echo UID=$$(id -u) >> .env ; \
411+
echo BINDING_VERSION=$(BINDING_VERSION) >> .env ; \
409412
if [ $$node = "NodeChrome" ] ; then \
410413
echo BROWSER=chrome >> .env ; \
411414
echo VIDEO_FILE_NAME=chrome_video.mp4 >> .env ; \
@@ -439,6 +442,7 @@ test_node_docker: docker hub chrome firefox edge
439442
echo REQUEST_TIMEOUT=$(or $(REQUEST_TIMEOUT), 30) >> .env ; \
440443
echo NODE=$$node >> .env ; \
441444
echo UID=$$(id -u) >> .env ; \
445+
echo BINDING_VERSION=$(BINDING_VERSION) >> .env ; \
442446
export $$(cat .env | xargs) ; \
443447
envsubst < config.toml > ./videos/config.toml ; \
444448
docker-compose -f docker-compose-v3-test-node-docker.yaml up --no-log-prefix --exit-code-from tests --build ; \
@@ -467,42 +471,42 @@ chart_test_template:
467471
./tests/charts/bootstrap.sh
468472

469473
chart_test_chrome:
470-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
474+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
471475
./tests/charts/make/chart_test.sh NodeChrome
472476

473477
chart_test_firefox:
474-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
478+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
475479
./tests/charts/make/chart_test.sh NodeFirefox
476480

477481
chart_test_edge:
478-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
482+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
479483
./tests/charts/make/chart_test.sh NodeEdge
480484

481485
chart_test_autoscaling_deployment_https:
482486
CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true CHART_ENABLE_BASIC_AUTH=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 \
483487
SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 \
484-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
488+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
485489
./tests/charts/make/chart_test.sh DeploymentAutoscaling
486490

487491
chart_test_autoscaling_deployment:
488492
CHART_ENABLE_TRACING=true SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_HOST=$$(hostname -i) RELEASE_NAME=selenium \
489493
SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 \
490-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
494+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
491495
./tests/charts/make/chart_test.sh DeploymentAutoscaling
492496

493497
chart_test_autoscaling_job_https:
494498
SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https CHART_ENABLE_BASIC_AUTH=true RELEASE_NAME=selenium SELENIUM_GRID_PORT=443 SUB_PATH=/ \
495-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
499+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
496500
./tests/charts/make/chart_test.sh JobAutoscaling
497501

498502
chart_test_autoscaling_job_hostname:
499503
CHART_ENABLE_TRACING=true CHART_ENABLE_INGRESS_HOSTNAME=true CHART_ENABLE_BASIC_AUTH=true \
500-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
504+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
501505
./tests/charts/make/chart_test.sh JobAutoscaling
502506

503507
chart_test_autoscaling_job:
504508
CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true SELENIUM_GRID_HOST=selenium-grid.local RELEASE_NAME=selenium SUB_PATH=/ \
505-
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
509+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
506510
./tests/charts/make/chart_test.sh JobAutoscaling
507511

508512
.PHONY: \

‎tests/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ "${CI:-false}" = "false" ]; then
77
source docker-selenium-tests/bin/activate
88
fi
99

10-
python -m pip install selenium==4.19.0 \
10+
python -m pip install selenium==${BINDING_VERSION} \
1111
docker===7.0.0 \
1212
chardet \
1313
| grep -v 'Requirement already satisfied'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ services:
3636
environment:
3737
- RUN_IN_DOCKER_COMPOSE=true
3838
- SELENIUM_GRID_HOST=selenium-hub
39+
- BINDING_VERSION=${BINDING_VERSION}
3940
command: ["./bootstrap.sh", "${NODE}"]

‎tests/docker-compose-v3-test-parallel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,5 @@ services:
7777
- RUN_IN_DOCKER_COMPOSE=true
7878
- SELENIUM_GRID_HOST=selenium-hub
7979
- TEST_PARALLEL_HARDENING=${TEST_PARALLEL_HARDENING}
80+
- BINDING_VERSION=${BINDING_VERSION}
8081
command: ["./bootstrap.sh", "${NODE}"]

‎tests/docker-compose-v3-test-video.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ services:
4747
environment:
4848
- RUN_IN_DOCKER_COMPOSE=true
4949
- SELENIUM_GRID_HOST=selenium-hub
50+
- BINDING_VERSION=${BINDING_VERSION}
5051
command: ["./bootstrap.sh", "${NODE}"]

0 commit comments

Comments
 (0)