Add --tries 3 arg when triggering e2e-tests upon releasing (#31285)
* Add ``--tries 3` arg when triggering e2e-tests * Make e2e-tests retry 3 times only for release pipelines
This commit is contained in:
+5
-2
@@ -671,7 +671,10 @@ def e2e_tests_server_step(edition, port=3001):
|
||||
],
|
||||
}
|
||||
|
||||
def e2e_tests_step(edition, port=3001):
|
||||
def e2e_tests_step(edition, port=3001, tries=None):
|
||||
cmd = './bin/grabpl e2e-tests --port {}'.format(port)
|
||||
if tries:
|
||||
cmd += ' --tries {}'.format(tries)
|
||||
return {
|
||||
'name': 'end-to-end-tests' + enterprise2_sfx(edition),
|
||||
'image': 'grafana/ci-e2e:12.19.0-1',
|
||||
@@ -685,7 +688,7 @@ def e2e_tests_step(edition, port=3001):
|
||||
# Have to re-install Cypress since it insists on searching for its binary beneath /root/.cache,
|
||||
# even though the Yarn cache directory is beneath /usr/local/share somewhere
|
||||
'./node_modules/.bin/cypress install',
|
||||
'./bin/grabpl e2e-tests --port {}'.format(port),
|
||||
cmd,
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ def get_steps(edition, ver_mode):
|
||||
gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2),
|
||||
package_step(edition=edition, ver_mode=ver_mode),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
e2e_tests_step(edition=edition),
|
||||
e2e_tests_step(edition=edition, tries=3),
|
||||
build_storybook_step(edition=edition, ver_mode=ver_mode),
|
||||
copy_packages_for_docker_step(),
|
||||
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
|
||||
@@ -117,7 +117,7 @@ def get_steps(edition, ver_mode):
|
||||
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
|
||||
upload_cdn(edition=edition2),
|
||||
e2e_tests_server_step(edition=edition2, port=3002),
|
||||
e2e_tests_step(edition=edition2, port=3002),
|
||||
e2e_tests_step(edition=edition2, port=3002, tries=3),
|
||||
])
|
||||
if should_upload:
|
||||
steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))
|
||||
|
||||
Reference in New Issue
Block a user