Skip to content

Commit d476b5d

Browse files
committed
build: use debian stable channel and enable Chromium test
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 4f2a6e4 commit d476b5d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),linuxserver)
2323
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),7.0.2)
2424
PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),linux/amd64)
2525
SEL_PASSWD := $(or $(SEL_PASSWD),$(SEL_PASSWD),secret)
26-
CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),128.0.6613.113)
26+
CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
2727

2828
all: hub \
2929
distributor \
@@ -643,7 +643,7 @@ test_video: video hub chrome firefox edge chromium
643643
sudo rm -rf ./tests/videos; mkdir -p ./tests/videos/upload
644644
sudo chmod -R 777 ./tests/videos
645645
docker_compose_file=$(or $(DOCKER_COMPOSE_FILE), docker-compose-v3-test-video.yml) ; \
646-
list_of_tests_amd64=$(or $(LIST_OF_TESTS_AMD64), "NodeChrome NodeFirefox NodeEdge") ; \
646+
list_of_tests_amd64=$(or $(LIST_OF_TESTS_AMD64), "NodeChrome NodeChromium NodeFirefox NodeEdge") ; \
647647
list_of_tests_arm64=$(or $(LIST_OF_TESTS_ARM64), "NodeChromium NodeFirefox") ; \
648648
if [ "$(PLATFORMS)" = "linux/amd64" ]; then \
649649
list_nodes="$${list_of_tests_amd64}" ; \
@@ -746,7 +746,7 @@ test_node_docker: hub standalone_docker standalone_chrome standalone_firefox sta
746746
sudo chmod -R 777 ./tests/videos
747747
docker_compose_file=$(or $(DOCKER_COMPOSE_FILE), docker-compose-v3-test-node-docker.yaml) ; \
748748
config_file=$(or $(CONFIG_FILE), config.toml) ; \
749-
list_of_tests_amd64=$(or $(LIST_OF_TESTS_AMD64), "NodeChrome NodeFirefox NodeEdge") ; \
749+
list_of_tests_amd64=$(or $(LIST_OF_TESTS_AMD64), "NodeChrome NodeChromium NodeFirefox NodeEdge") ; \
750750
list_of_tests_arm64=$(or $(LIST_OF_TESTS_ARM64), "NodeChromium NodeFirefox") ; \
751751
if [ "$(PLATFORMS)" = "linux/amd64" ]; then \
752752
list_nodes="$${list_of_tests_amd64}" ; \
@@ -846,7 +846,7 @@ chart_render_template:
846846
RENDER_HELM_TEMPLATE_ONLY=true make chart_test_autoscaling_disabled chart_test_autoscaling_deployment_https chart_test_autoscaling_deployment chart_test_autoscaling_job_https chart_test_autoscaling_job_hostname chart_test_autoscaling_job
847847

848848
chart_test_autoscaling_disabled:
849-
PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=false RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false CHART_ENABLE_TRACING=true \
849+
PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true SELENIUM_GRID_TEST_HEADLESS=true RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false CHART_ENABLE_TRACING=true \
850850
SECURE_INGRESS_ONLY_GENERATE=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 EXTERNAL_UPLOADER_CONFIG=true \
851851
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
852852
TEMPLATE_OUTPUT_FILENAME="k8s_nodeChromium_enableTracing_secureIngress_generateCerts_ingressPublicIP_subPath.yaml" \
@@ -883,7 +883,7 @@ chart_test_autoscaling_job_hostname:
883883
./tests/charts/make/chart_test.sh JobAutoscaling
884884

885885
chart_test_autoscaling_job:
886-
PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true TEST_CHROMIUM=false RELEASE_NAME=selenium CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true \
886+
PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true TEST_CHROMIUM=true RELEASE_NAME=selenium CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true \
887887
SECURE_INGRESS_ONLY_CONFIG_INLINE=true SECURE_USE_EXTERNAL_CERT=true CHART_ENABLE_INGRESS_HOSTNAME=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=selenium-grid.prod SUB_PATH=/ SELENIUM_GRID_PORT=443 \
888888
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
889889
TEMPLATE_OUTPUT_FILENAME="k8s_fullDistributed_secureIngress_externalCerts_ingressHostName_ingressTLSInline_autoScaling_scaledJob_existingKEDA_prefixSelenium_nodeChromium_enableTracing.yaml" \

NodeChromium/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ USER root
99
# Install Chromium
1010
ARG CHROMIUM_VERSION="latest"
1111
ARG CHROMIUM_DEB_SITE="http://deb.debian.org/debian"
12-
RUN echo "deb ${CHROMIUM_DEB_SITE}/ sid main" >> /etc/apt/sources.list \
12+
RUN echo "deb ${CHROMIUM_DEB_SITE}/ stable main" >> /etc/apt/sources.list \
1313
&& wget -qO- https://ftp-master.debian.org/keys/archive-key-12.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-keyring.gpg \
1414
&& wget -qO- https://ftp-master.debian.org/keys/archive-key-12-security.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-security-keyring.gpg \
1515
&& apt-get update -qqy \

0 commit comments

Comments
 (0)