Skip to content

Commit 52cd00b

Browse files
committed
[ci] Cloud vendor login pass via request capabilities
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent ab6cee1 commit 52cd00b

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,10 @@ relayNode:
5959
videoRecorder:
6060
enabled: false
6161
extraEnvironmentVariables:
62-
# - name: SAUCE_USERNAME
63-
# value: "<your_SAUCE_USERNAME>"
64-
# - name: SAUCE_ACCESS_KEY
65-
# value: "<your_SAUCE_ACCESS_KEY>"
6662
# - name: SAUCE_REGION
6763
# value: "<your_SAUCE_REGION>"
6864
# - name: SE_NODE_RELAY_URL
69-
# value: "https://$SAUCE_USERNAME:$SAUCE_ACCESS_KEY@ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
65+
# value: "https://ondemand.$SAUCE_REGION.saucelabs.com:443/wd/hub"
7066
extraEnvFrom:
7167
# - secretRef:
7268
# name: your-secret-with-all-env-vars

tests/SeleniumTests/__init__.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,13 @@ def setUp(self):
190190
platform_name = random.choice(LIST_PLATFORMS)
191191
if platform_name:
192192
options.set_capability('platformName', platform_name)
193+
if TEST_MULTIPLE_PLATFORMS_RELAY:
194+
options.set_capability('sauce:options', {
195+
'username': os.environ.get('SAUCE_USERNAME'),
196+
'accessKey': os.environ.get('SAUCE_ACCESS_KEY'),
197+
'name': f"{self._testMethodName} ({self.__class__.__name__})",
198+
'seleniumVersion': '4.29.0',
199+
})
193200
start_time = time.time()
194201
self.driver = webdriver.Remote(
195202
options=options,
@@ -228,6 +235,13 @@ def setUp(self):
228235
platform_name = random.choice(LIST_PLATFORMS)
229236
if platform_name:
230237
options.set_capability('platformName', platform_name)
238+
if TEST_MULTIPLE_PLATFORMS_RELAY:
239+
options.set_capability('sauce:options', {
240+
'username': os.environ.get('SAUCE_USERNAME'),
241+
'accessKey': os.environ.get('SAUCE_ACCESS_KEY'),
242+
'name': f"{self._testMethodName} ({self.__class__.__name__})",
243+
'seleniumVersion': '4.29.0',
244+
})
231245
start_time = time.time()
232246
self.driver = webdriver.Remote(
233247
options=options,
@@ -271,6 +285,13 @@ def setUp(self):
271285
platform_name = random.choice(LIST_PLATFORMS)
272286
if platform_name:
273287
options.set_capability('platformName', platform_name)
288+
if TEST_MULTIPLE_PLATFORMS_RELAY:
289+
options.set_capability('sauce:options', {
290+
'username': os.environ.get('SAUCE_USERNAME'),
291+
'accessKey': os.environ.get('SAUCE_ACCESS_KEY'),
292+
'name': f"{self._testMethodName} ({self.__class__.__name__})",
293+
'seleniumVersion': '4.29.0',
294+
})
274295
start_time = time.time()
275296
self.driver = webdriver.Remote(
276297
options=options,

tests/charts/make/chart_test.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,8 @@ fi
357357

358358
if [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then
359359
kubectl create secret generic -n ${SELENIUM_NAMESPACE} test-cloud-credentials \
360-
--from-literal=SAUCE_USERNAME=${SAUCE_USERNAME} \
361-
--from-literal=SAUCE_ACCESS_KEY=${SAUCE_ACCESS_KEY} \
362360
--from-literal=SAUCE_REGION=${SAUCE_REGION} \
363-
--from-literal=SE_NODE_RELAY_URL="https://\$SAUCE_USERNAME:\$SAUCE_ACCESS_KEY@ondemand.\$SAUCE_REGION.saucelabs.com:443/wd/hub" \
361+
--from-literal=SE_NODE_RELAY_URL="https://ondemand.\$SAUCE_REGION.saucelabs.com:443/wd/hub" \
364362
--dry-run=client -o yaml | kubectl apply -n ${SELENIUM_NAMESPACE} -f -
365363
fi
366364

0 commit comments

Comments
 (0)