Skip to content

N
nexpie-grafana-theme
Commit d1cee1ad by Dimitris Sotirakis Committed by GitHub
Options

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
parent 3c1f27b0
Showing with 16 additions and 13 deletions
.drone.yml
...@@ -864,7 +864,7 @@ steps: ...@@ -864,7 +864,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -1275,7 +1275,7 @@ steps: ...@@ -1275,7 +1275,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -1412,7 +1412,7 @@ steps: ...@@ -1412,7 +1412,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3002 - ./bin/grabpl e2e-tests --port 3002 --tries 3
environment: environment:
HOST: end-to-end-tests-server-enterprise2 HOST: end-to-end-tests-server-enterprise2
depends_on: depends_on:
...@@ -1783,7 +1783,7 @@ steps: ...@@ -1783,7 +1783,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -2183,7 +2183,7 @@ steps: ...@@ -2183,7 +2183,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -2314,7 +2314,7 @@ steps: ...@@ -2314,7 +2314,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3002 - ./bin/grabpl e2e-tests --port 3002 --tries 3
environment: environment:
HOST: end-to-end-tests-server-enterprise2 HOST: end-to-end-tests-server-enterprise2
depends_on: depends_on:
...@@ -2681,7 +2681,7 @@ steps: ...@@ -2681,7 +2681,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -3049,7 +3049,7 @@ steps: ...@@ -3049,7 +3049,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3001 - ./bin/grabpl e2e-tests --port 3001 --tries 3
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
...@@ -3190,7 +3190,7 @@ steps: ...@@ -3190,7 +3190,7 @@ steps:
image: grafana/ci-e2e:12.19.0-1 image: grafana/ci-e2e:12.19.0-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./bin/grabpl e2e-tests --port 3002 - ./bin/grabpl e2e-tests --port 3002 --tries 3
environment: environment:
HOST: end-to-end-tests-server-enterprise2 HOST: end-to-end-tests-server-enterprise2
depends_on: depends_on:
......
scripts/lib.star
...@@ -671,7 +671,10 @@ def e2e_tests_server_step(edition, port=3001): ...@@ -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 { return {
'name': 'end-to-end-tests' + enterprise2_sfx(edition), 'name': 'end-to-end-tests' + enterprise2_sfx(edition),
'image': 'grafana/ci-e2e:12.19.0-1', 'image': 'grafana/ci-e2e:12.19.0-1',
...@@ -685,7 +688,7 @@ def e2e_tests_step(edition, port=3001): ...@@ -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, # 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 # even though the Yarn cache directory is beneath /usr/local/share somewhere
'./node_modules/.bin/cypress install', './node_modules/.bin/cypress install',
'./bin/grabpl e2e-tests --port {}'.format(port), cmd,
], ],
} }
......
scripts/release.star
...@@ -92,7 +92,7 @@ def get_steps(edition, ver_mode): ...@@ -92,7 +92,7 @@ def get_steps(edition, ver_mode):
gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2), gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode), package_step(edition=edition, ver_mode=ver_mode),
e2e_tests_server_step(edition=edition), 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), build_storybook_step(edition=edition, ver_mode=ver_mode),
copy_packages_for_docker_step(), copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish), build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
...@@ -117,7 +117,7 @@ def get_steps(edition, ver_mode): ...@@ -117,7 +117,7 @@ def get_steps(edition, ver_mode):
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']), package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
upload_cdn(edition=edition2), upload_cdn(edition=edition2),
e2e_tests_server_step(edition=edition2, port=3002), 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: if should_upload:
steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode)) steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment