Skip to content

Commit b4327c2

Browse files
authored
build: get latest upstream build in release workflow (#2325)
1 parent b5d6af3 commit b4327c2

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

.github/workflows/deploy.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Deploys
33
on:
44
workflow_dispatch:
55
inputs:
6+
stable:
7+
description: 'Use upstream stable build'
8+
required: true
9+
type: string
10+
default: 'true'
611
release:
712
description: 'Deploy a new release'
813
required: false
@@ -28,7 +33,7 @@ jobs:
2833
if: contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.skip-test == 'false')
2934
uses: ./.github/workflows/build-test.yml
3035
with:
31-
release: ${{ github.event.inputs.release || true }}
36+
release: ${{ github.event.inputs.stable || true }}
3237

3338
deploy:
3439
needs:
@@ -61,7 +66,7 @@ jobs:
6166
- name: Set Selenium base version
6267
uses: ./.github/actions/get-latest-upstream
6368
with:
64-
release: ${{ github.event.inputs.release || true }}
69+
release: ${{ github.event.inputs.stable || true }}
6570
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
6671
- name: Sets build date
6772
run: |

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ ci: build test
7070
base:
7171
cd ./Base && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
7272

73+
base_nightly:
74+
cd ./Base && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION_NIGHTLY) --build-arg RELEASE=$(BASE_RELEASE_NIGHTLY) --build-arg AUTHORS=$(AUTHORS) -t $(NAME)/base:$(TAG_VERSION) .
75+
7376
hub: base
7477
cd ./Hub && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/hub:$(TAG_VERSION) .
7578

@@ -762,7 +765,7 @@ chart_test_template:
762765
./tests/charts/bootstrap.sh
763766

764767
chart_test_autoscaling_disabled:
765-
PLATFORMS=$(PLATFORMS) RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false TEST_DELAY_AFTER_TEST=15 CHART_ENABLE_TRACING=true \
768+
PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false TEST_DELAY_AFTER_TEST=15 CHART_ENABLE_TRACING=true \
766769
SECURE_INGRESS_ONLY_GENERATE=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 \
767770
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
768771
./tests/charts/make/chart_test.sh NoAutoscaling
@@ -794,11 +797,18 @@ chart_test_autoscaling_job_hostname:
794797
./tests/charts/make/chart_test.sh JobAutoscaling
795798

796799
chart_test_autoscaling_job:
797-
PLATFORMS=$(PLATFORMS) RELEASE_NAME=selenium CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true \
800+
PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true RELEASE_NAME=selenium CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true \
798801
SECURE_INGRESS_ONLY_GENERATE=true CHART_ENABLE_INGRESS_HOSTNAME=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=selenium-grid.prod SUB_PATH=/ SELENIUM_GRID_PORT=443 \
799802
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
800803
./tests/charts/make/chart_test.sh JobAutoscaling
801804

805+
chart_test_language_bindings:
806+
PLATFORMS=$(PLATFORMS) \
807+
SELENIUM_GRID_HOST=$$(hostname -i) \
808+
SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 \
809+
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) \
810+
./tests/charts/make/chart_test.sh DeploymentAutoscaling
811+
802812
.PHONY: \
803813
all \
804814
base \

NodeChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ USER ${SEL_UID}
7474
# Dumping Browser information for config
7575
#============================================
7676
RUN echo "chrome" > /opt/selenium/browser_name
77-
RUN google-chrome --version | awk '{print $3}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
77+
RUN google-chrome --version | awk '{print $3}' > /opt/selenium/browser_version
7878
RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/google-chrome\"}" > /opt/selenium/browser_binary_location
7979

8080
ENV SE_OTEL_SERVICE_NAME="selenium-node-chrome"

NodeChromium/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ LABEL authors=${AUTHORS}
77
USER root
88

99
# Install Chromium
10-
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
11-
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 \
12-
&& apt-get update -qqy \
13-
&& apt-get -qqy install chromium \
10+
RUN apt-get update -qqy \
11+
&& apt-get install -y software-properties-common \
12+
&& add-apt-repository ppa:xtradeb/apps \
13+
&& apt-get -qqy install chromium chromium-l10n \
1414
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1515

1616
#=================================
@@ -38,7 +38,7 @@ USER ${SEL_UID}
3838
# Dumping Browser information for config
3939
#============================================
4040
RUN echo "chrome" > /opt/selenium/browser_name
41-
RUN chromium --version | awk '{print $2}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
41+
RUN chromium --version | awk '{print $2}' > /opt/selenium/browser_version
4242
RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/chromium\"}" > /opt/selenium/browser_binary_location
4343

4444
ENV SE_OTEL_SERVICE_NAME="selenium-node-chromium"

NodeEdge/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ USER ${SEL_UID}
6868
# Dumping Browser information for config
6969
#============================================
7070
RUN echo "MicrosoftEdge" > /opt/selenium/browser_name
71-
RUN microsoft-edge --version | awk '{print $3}' | cut -d'.' -f1,2 > /opt/selenium/browser_version
71+
RUN microsoft-edge --version | awk '{print $3}' > /opt/selenium/browser_version
7272
RUN echo "\"ms:edgeOptions\": {\"binary\": \"/usr/bin/microsoft-edge\"}" > /opt/selenium/browser_binary_location
7373

7474
ENV SE_OTEL_SERVICE_NAME="selenium-node-edge"

tests/charts/make/chart_test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ fi
170170
if [ "${TEST_PLATFORMS}" != "linux/amd64" ]; then
171171
HELM_COMMAND_SET_IMAGES="${HELM_COMMAND_SET_IMAGES} \
172172
--set edgeNode.enabled=false \
173+
"
174+
fi
175+
176+
if [ "${TEST_PLATFORMS}" != "linux/amd64" ] || [ "${TEST_CHROMIUM}" = "true" ]; then
177+
HELM_COMMAND_SET_IMAGES="${HELM_COMMAND_SET_IMAGES} \
173178
--set chromeNode.imageName=node-chromium \
174179
"
175180
fi

0 commit comments

Comments
 (0)