Skip to content

Commit

Permalink
Update Selenium Grid 4.23.1
Browse files Browse the repository at this point in the history
Signed-off-by: Viet Nguyen Duc <[email protected]>
  • Loading branch information
VietND96 committed Aug 10, 2024
1 parent b91d300 commit cd58e7c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,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.23.0)
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.23.0)
BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.23.0)
BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.23.1)
BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.23.1)
BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.24.0-SNAPSHOT)
VERSION := $(or $(VERSION),$(VERSION),4.23.0)
VERSION := $(or $(VERSION),$(VERSION),4.23.1)
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 Expand Up @@ -67,10 +67,12 @@ build: all

ci: build test

base:
gen_certs:
rm -rf ./Base/configs/node && mkdir -p ./Base/configs/node && cp -r ./charts/selenium-grid/configs/node ./Base/configs
rm -rf ./Base/certs && cp -r ./charts/selenium-grid/certs ./Base
./Base/certs/gen-cert-helper.sh -d ./Base/certs

base: gen_certs
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) .

base_nightly:
Expand Down
2 changes: 2 additions & 0 deletions tests/SeleniumTests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ def setUp(self):
options.set_capability('appium:adbExecTimeout', 120000)
options.set_capability('appium:uiautomator2ServerInstallTimeout', 120000)
options.set_capability('appium:appWaitDuration', 120000)
options.set_capability('appium:suppressKillServer', True)
options.set_capability('appium:allowDelayAdb', False)
else:
options.set_capability('platformName', 'Linux')
start_time = time.time()
Expand Down

0 comments on commit cd58e7c

Please sign in to comment.