Skip to content

Commit 5bc1328

Browse files
committed
[ci] Fix workflows stable for ARM64 tests
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 4024ce8 commit 5bc1328

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.circleci/config.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ jobs:
216216
exit 1
217217
- run:
218218
name: "Test Docker images"
219+
no_output_timeout: 60m
219220
command: |
220221
N=3
221222
while [ $N -gt 0 ]; do
@@ -309,12 +310,8 @@ jobs:
309310
source $BASH_ENV
310311
- run:
311312
name: "Test Selenium Grid on Kubernetes"
312-
no_output_timeout: 30m
313+
no_output_timeout: 60m
313314
command: |
314-
if [ "${TEST_STRATEGY}" == "playwright_connect_grid" ]; then
315-
PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity
316-
exit $?
317-
fi
318315
N=3
319316
while [ $N -gt 0 ]; do
320317
output=$(eval "PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity")

charts/selenium-grid/multiple-nodes-platform.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ crossBrowsers:
2020
platformName: 'Linux'
2121
browserVersion: ''
2222
firefoxNode:
23-
- nameOverride: '{{ $.Release.Name }}-node-chrome-platform-any'
23+
- nameOverride: '{{ $.Release.Name }}-node-firefox-platform-any'
2424
hpa:
2525
platformName: ''
2626
browserVersion: ''

tests/SeleniumTests/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ class SeleniumGenericTests(unittest.TestCase):
5959

6060
def test_title(self):
6161
self.driver.get('https://the-internet.herokuapp.com')
62+
wait = WebDriverWait(self.driver, WEB_DRIVER_WAIT_TIMEOUT)
63+
wait.until(EC.title_is('The Internet'))
6264
self.assertTrue(self.driver.title == 'The Internet')
6365

6466
# https://github.com/tourdedave/elemental-selenium-tips/blob/master/03-work-with-frames/python/frames.py

tests/charts/make/chart_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ cleanup() {
7777
done
7878
if [ "${SKIP_CLEANUP}" = "false" ] || [ "${CI:-false}" != "false" ]; then
7979
echo "Clean up chart release and namespace"
80-
helm delete ${RELEASE_NAME} --namespace ${SELENIUM_NAMESPACE} --wait
80+
helm delete ${RELEASE_NAME} --namespace ${SELENIUM_NAMESPACE} --no-hooks || true
8181
fi
8282
}
8383

@@ -94,13 +94,13 @@ on_failure() {
9494
kubectl describe all -n ${SELENIUM_NAMESPACE} >> tests/tests/describe_all_resources_${MATRIX_BROWSER}.txt
9595
kubectl describe pod -n ${SELENIUM_NAMESPACE} >> tests/tests/describe_all_resources_${MATRIX_BROWSER}.txt
9696
echo "There is step failed with exit status $exit_status"
97-
cleanup
9897
sudo chmod -R 777 ${HOST_PATH}/logs
9998
exit $exit_status
10099
}
101100

102101
# Trap ERR signal and call on_failure function
103102
trap 'on_failure' ERR EXIT
103+
trap 'cleanup' ERR
104104

105105
if [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then
106106
rm -rf tests/tests/*

0 commit comments

Comments
 (0)