[v8.3.x] chore(drone): switch to using cypress built image for e2e tests (#44050)
* chore(drone): switch to using cypress built image for e2e tests
(cherry picked from commit ec9d6b9ca9)
* Remove volumes - downgrade cypress version
Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
This commit is contained in:
co-authored by
Timur Olzhabayev
parent
3aab445245
commit
3878ff9324
@@ -14,7 +14,6 @@ load(
|
||||
'build_frontend_step',
|
||||
'build_plugins_step',
|
||||
'package_step',
|
||||
'install_cypress_step',
|
||||
'e2e_tests_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
@@ -96,8 +95,7 @@ def get_steps(edition, is_downstream=False):
|
||||
|
||||
# Insert remaining steps
|
||||
build_steps.extend([
|
||||
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
|
||||
install_cypress_step(),
|
||||
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite', edition=edition),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
|
||||
@@ -14,7 +14,6 @@ load(
|
||||
'test_backend_integration_step',
|
||||
'test_frontend_step',
|
||||
'package_step',
|
||||
'install_cypress_step',
|
||||
'e2e_tests_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
@@ -90,7 +89,6 @@ def pr_pipelines(edition):
|
||||
# Insert remaining build_steps
|
||||
build_steps.extend([
|
||||
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants),
|
||||
install_cypress_step(),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite', edition=edition),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
|
||||
@@ -18,7 +18,6 @@ load(
|
||||
'build_frontend_step',
|
||||
'build_plugins_step',
|
||||
'package_step',
|
||||
'install_cypress_step',
|
||||
'e2e_tests_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
@@ -229,7 +228,6 @@ def get_steps(edition, ver_mode):
|
||||
|
||||
if not disable_tests:
|
||||
build_steps.extend([
|
||||
install_cypress_step(),
|
||||
e2e_tests_step('dashboards-suite', edition=edition, tries=3),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition, tries=3),
|
||||
e2e_tests_step('panels-suite', edition=edition, tries=3),
|
||||
|
||||
@@ -667,40 +667,21 @@ def e2e_tests_server_step(edition, port=3001):
|
||||
],
|
||||
}
|
||||
|
||||
def install_cypress_step():
|
||||
return {
|
||||
'name': 'cypress',
|
||||
'image': 'grafana/ci-e2e:12.19.0-1',
|
||||
'depends_on': [
|
||||
'package',
|
||||
],
|
||||
'commands': [
|
||||
'yarn run cypress install',
|
||||
],
|
||||
'volumes': [{
|
||||
'name': 'cypress_cache',
|
||||
'path': '/root/.cache/Cypress'
|
||||
}],
|
||||
}
|
||||
|
||||
def e2e_tests_step(suite, edition, port=3001, tries=None):
|
||||
cmd = './bin/grabpl e2e-tests --port {} --suite {}'.format(port, suite)
|
||||
if tries:
|
||||
cmd += ' --tries {}'.format(tries)
|
||||
return {
|
||||
'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition),
|
||||
'image': 'grafana/ci-e2e:12.19.0-1',
|
||||
'image': 'cypress/included:8.4.1',
|
||||
'depends_on': [
|
||||
'cypress',
|
||||
'package',
|
||||
],
|
||||
'environment': {
|
||||
'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition),
|
||||
},
|
||||
'volumes': [{
|
||||
'name': 'cypress_cache',
|
||||
'path': '/root/.cache/Cypress'
|
||||
}],
|
||||
'commands': [
|
||||
'apt-get install -y netcat',
|
||||
cmd,
|
||||
],
|
||||
}
|
||||
|
||||
@@ -38,9 +38,6 @@ def pipeline(
|
||||
'services': services,
|
||||
'steps': steps,
|
||||
'volumes': [{
|
||||
'name': 'cypress_cache',
|
||||
'temp': {},
|
||||
},{
|
||||
'name': 'docker',
|
||||
'host': {
|
||||
'path': '/var/run/docker.sock',
|
||||
|
||||
Reference in New Issue
Block a user