Skip to content

Commit d56337e

Browse files
authored
Merge branch 'trunk' into helm-chart
2 parents 19ab751 + da15922 commit d56337e

File tree

6 files changed

+45
-16
lines changed

6 files changed

+45
-16
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Output Docker info
2020
run: docker info
2121
- name: Set up Python
22-
uses: actions/setup-python@v4.7.1
22+
uses: actions/setup-python@v4.8.0
2323
with:
2424
python-version: '3.11'
2525
check-latest: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Output Docker info
2121
run: docker info
2222
- name: Set up Python
23-
uses: actions/setup-python@v4.7.1
23+
uses: actions/setup-python@v4.8.0
2424
with:
2525
python-version: '3.11'
2626
check-latest: true

.github/workflows/test-video.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Output Docker info
1717
run: docker info
1818
- name: Set up Python
19-
uses: actions/setup-python@v4.7.1
19+
uses: actions/setup-python@v4.8.0
2020
with:
2121
python-version: '3.11'
2222
check-latest: true

Base/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
FROM ubuntu:jammy-20231004
22
LABEL authors="Selenium <selenium-developers@googlegroups.com>"
33

4+
ARG VERSION
5+
ARG RELEASE=selenium-${VERSION}
46
#================================================
57
# Customize sources for apt-get
68
#================================================
@@ -74,7 +76,7 @@ COPY supervisord.conf /etc
7476
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
7577
&& touch /opt/selenium/config.toml \
7678
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
77-
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.15.0/selenium-server-4.15.0.jar \
79+
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/${RELEASE}/selenium-server-${VERSION}.jar \
7880
-O /opt/selenium/selenium-server.jar \
7981
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
8082
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ NAME := $(or $(NAME),$(NAME),selenium)
22
CURRENT_DATE := $(shell date '+%Y%m%d')
33
BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
44
VERSION := $(or $(VERSION),$(VERSION),4.15.0)
5+
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.15.0)
6+
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-$(BASE_VERSION))
57
TAG_VERSION := $(VERSION)-$(BUILD_DATE)
68
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
79
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
@@ -37,7 +39,7 @@ build: all
3739
ci: build test
3840

3941
base:
40-
cd ./Base && docker build $(BUILD_ARGS) -t $(NAME)/base:$(TAG_VERSION) .
42+
cd ./Base && docker build $(BUILD_ARGS) --build-arg VERSION=$(BASE_VERSION) --build-arg RELEASE=$(BASE_RELEASE) -t $(NAME)/base:$(TAG_VERSION) .
4143

4244
hub: base
4345
cd ./Hub && docker build $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/hub:$(TAG_VERSION) .

charts/selenium-grid/CHANGELOG.md

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,47 @@
22

33
All notable changes to this helm chart will be documented in this file.
44

5-
## :heavy_check_mark: 0.24.0
5+
## :heavy_check_mark: 0.25.3
66

7-
### Added
7+
### Changed
8+
- Update image tag to 4.15.0-20231129
9+
- Update tag in docs and files :: Selenium CI Bot
10+
- test: Add sanity test for download file (#2034) [deploy] :: Viet Nguyen Duc
11+
- feat(chart): distribution registry can be set global and individual component (#2030) :: Viet Nguyen Duc
12+
- Update tag in docs and files [skip ci] :: Selenium CI Bot
13+
- test: Sanity tests Selenium Grid chart via Makefile commands (#2029) :: Viet Nguyen Duc
14+
- Feature run selenium tests grid on kubernetes via helm chart (#2027) :: Amar Deep Singh
15+
- feat: CI Bot bump chart version along with new deploy image version (#2028) :: Viet Nguyen Duc
16+
- Update NodeChrome support latest version from GoogleChromeLabs (#2018) :: Viet Nguyen Duc
17+
- Update tag in docs and files [skip ci] :: Selenium CI Bot
18+
- corrected typo in selenium grid charts (#2010) :: Thabelo Ramabulana
19+
20+
## :heavy_check_mark: 0.25.1
821

22+
### Changed
23+
- Update image tag to 4.15.0-20231110
24+
- Bug: Error setting name in helm release #2006 #2007 (#2009) :: Viet Nguyen Duc
25+
26+
## :heavy_check_mark: 0.25.0
27+
28+
### Changed
29+
- Update image tag to 4.15.0-20231110
30+
- feat(helm-test): Added helm test and linting (#2003) :: Amar Deep Singh
931
- Update tag in docs and files [skip ci] :: Selenium CI Bot
10-
- Bumping chart version :: Diego Molina
11-
- Fix minor issues after PR #1881 and #1981 (#1983) :: Viet Nguyen Duc
12-
- Improve default value for videoRecorder in chart (#1984) :: Viet Nguyen Duc
13-
- Improve chart templates in the section videoRecorder (#1987) :: Viet Nguyen Duc
14-
- Update to Selenium 4.15.0 (#1990) :: Luis Correia
15-
- feat(autoscaling): Unified parameters to set scaled options for browser nodes (#1989) :: Viet Nguyen Duc
16-
- Add chart parameter ingress.paths to configure custom paths (#1994) :: Viet Nguyen Duc
17-
- feat: Adding port to nodes service (#1196) :: Viet Nguyen Duc
32+
- Update tag in docs and files [skip ci] :: Selenium CI Bot
33+
- feat: Adding port to nodes service (#1996) :: Viet Nguyen Duc
34+
35+
## :heavy_check_mark: 0.24.0
1836

1937
### Changed
20-
- Update image tag to 4.15.0-20231129
38+
- Update image tag to 4.15.0-20231102
39+
- Bumping chart version :: Viet Nguyen Duc
40+
- Add chart parameter ingress.paths to configure custom paths (#1994) :: Viet Nguyen Duc
41+
- feat(autoscaling): Unified parameters to set scaled options for browser nodes (#1989) :: Viet Nguyen Duc
42+
- Update tag in docs and files [skip ci] :: Selenium CI Bot
43+
- Improve chart templates in the section videoRecorder (#1987) :: Viet Nguyen Duc
44+
- Improve default value for videoRecorder in chart (#1984) :: Viet Nguyen Duc
45+
- Fix minor issues after PR #1881 and #1981 (#1983) :: Viet Nguyen Duc
2146

2247
## :heavy_check_mark: 0.23.0
2348

0 commit comments

Comments
 (0)