Skip to content

Commit

Permalink
Release 4.18.0
Browse files Browse the repository at this point in the history
[deploy]

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
  • Loading branch information
VietND96 committed Feb 20, 2024
1 parent 4671869 commit fc20682
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 15 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
NAME := $(or $(NAME),$(NAME),selenium)
CURRENT_DATE := $(shell date '+%Y%m%d')
BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.17.0)
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.17.0)
BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.18.0)
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.18.0)
BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.18.0-SNAPSHOT)
VERSION := $(or $(VERSION),$(VERSION),4.17.0)
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.19.0-SNAPSHOT)
VERSION := $(or $(VERSION),$(VERSION),4.18.0)
TAG_VERSION := $(VERSION)-$(BUILD_DATE)
CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
Expand Down
2 changes: 1 addition & 1 deletion charts/selenium-grid/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- Chart is using image tag 4.17.0-20240123

### Added
- feat(chart): templating in name(Override) for new object [deploy] Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com> :: Viet Nguyen Duc
- feat(chart): templating in name(Override) for new object [deploy] :: Viet Nguyen Duc
- feat(chart): templating in name(Override) (#2107) :: Bas M
- feat(chart): Add node registration secret to exec preStop container Update default scalingStrategy.strategy: accurate [skip ci] :: Viet Nguyen Duc
- feat(chart): Configuration extra scripts mount to container (#2105) :: Viet Nguyen Duc
Expand Down
14 changes: 7 additions & 7 deletions docker-compose-v3-video-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
version: "3"
services:
chrome:
image: selenium/node-chrome:nightly
image: selenium/node-chrome:4.17.0-20240123
shm_size: 2gb
depends_on:
- selenium-hub
Expand All @@ -15,7 +15,7 @@ services:
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443

edge:
image: selenium/node-edge:nightly
image: selenium/node-edge:4.17.0-20240123
shm_size: 2gb
depends_on:
- selenium-hub
Expand All @@ -25,7 +25,7 @@ services:
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443

firefox:
image: selenium/node-firefox:nightly
image: selenium/node-firefox:4.17.0-20240123
shm_size: 2gb
depends_on:
- selenium-hub
Expand All @@ -35,7 +35,7 @@ services:
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443

chrome_video:
image: selenium/video:nightly
image: selenium/video:ffmpeg-6.1-20240123
depends_on:
- chrome
environment:
Expand All @@ -55,7 +55,7 @@ services:
- RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com

edge_video:
image: selenium/video:nightly
image: selenium/video:ffmpeg-6.1-20240123
depends_on:
- edge
environment:
Expand All @@ -75,7 +75,7 @@ services:
- RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com

firefox_video:
image: selenium/video:nightly
image: selenium/video:ffmpeg-6.1-20240123
depends_on:
- firefox
environment:
Expand All @@ -95,7 +95,7 @@ services:
- RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com

selenium-hub:
image: selenium/hub:nightly
image: selenium/hub:4.17.0-20240123
container_name: selenium-hub
ports:
- "4442:4442"
Expand Down
2 changes: 2 additions & 0 deletions generate_chart_changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ generate_changelog() {

# Get the changes for each section (Added, Removed, Fixed, Changed)
image_tag_changes=$(echo "Chart is using image tag $CHART_APP_VERSION" | sed -e 's/^/- /')
k8s_versions_tested=$(echo "Chart is tested on Kubernetes versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "k8s-version: '\Kv.*(?=')" | tr '\n' ',')")
added_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^feat|^add" | sed -e 's/^/- /')
removed_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^remove|^deprecate|^delete" | sed -e 's/^/- /')
fixed_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^fix|^bug" | sed -e 's/^/- /')
Expand All @@ -46,6 +47,7 @@ generate_changelog() {
echo "## :heavy_check_mark: ${current_tag}" >> "$temp_file"
echo "" >> "$temp_file"
echo "$image_tag_changes" >> "$temp_file"
echo "$k8s_versions_tested" >> "$temp_file"
echo "" >> "$temp_file"

if [ -n "$added_changes" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "${CI:-false}" = "false" ]; then
source docker-selenium-tests/bin/activate
fi

python -m pip install selenium==4.17.2 \
python -m pip install selenium==4.18.0 \
docker===6.1.3 \
| grep -v 'Requirement already satisfied'

Expand Down
2 changes: 1 addition & 1 deletion tests/charts/ci/base-auth-ingress-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ hub:
- name: SE_SESSION_RETRY_INTERVAL
value: "5"
- name: SE_HEALTHCHECK_INTERVAL
value: "5"
value: "15"
- name: SE_REJECT_UNSUPPORTED_CAPS
value: "false"
- name: SE_OPTS
Expand Down
5 changes: 4 additions & 1 deletion tests/charts/make/chart_cluster_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ elif [ "${CLUSTER}" = "minikube" ]; then
sudo chmod 777 /tmp
export CHANGE_MINIKUBE_NONE_USER=true
sudo -SE minikube start --vm-driver=none --cpus ${CPUs} --memory ${MEMORY} \
--kubernetes-version=${KUBERNETES_VERSION} --network-plugin=cni --cni=${CNI} --container-runtime=${CONTAINER_RUNTIME}
--kubernetes-version=${KUBERNETES_VERSION} --network-plugin=cni --cni=${CNI} --container-runtime=${CONTAINER_RUNTIME} --wait=all
sudo chown -R $USER $HOME/.kube $HOME/.minikube
fi

Expand All @@ -70,3 +70,6 @@ if [ "${CLUSTER}" = "kind" ]; then
kind load docker-image --name ${CLUSTER_NAME} "$image"
done
fi

echo "Wait for KEDA core to be ready"
kubectl -n ${KEDA_NAMESPACE} wait --for=condition=ready pod -l app.kubernetes.io/instance=${KEDA_NAMESPACE} --timeout 180s
2 changes: 2 additions & 0 deletions tests/charts/make/chart_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ helm template --debug ${HELM_COMMAND_ARGS} > tests/tests/cluster_deployment_mani
echo "Deploy Selenium Grid Chart"
helm upgrade --install ${HELM_COMMAND_ARGS}

kubectl get pods -A

echo "Run Tests"
export CHART_CERT_PATH=$(readlink -f ${CHART_CERT_PATH})
export SELENIUM_GRID_PROTOCOL=${SELENIUM_GRID_PROTOCOL}
Expand Down

0 comments on commit fc20682

Please sign in to comment.