* Make e2e test depend on binary builds
* Search for binary in the correct folders
* Remove package file var
* Add ARCH var
(cherry picked from commit 7bb5a5b318)
This commit is contained in:
@@ -14,7 +14,7 @@ load(
|
||||
'build_frontend_step',
|
||||
'build_plugins_step',
|
||||
'package_step',
|
||||
'e2e_tests_server_step',
|
||||
'grafana_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
'build_frontend_docs_step',
|
||||
@@ -95,8 +95,8 @@ 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),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
|
||||
grafana_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite', edition=edition),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
e2e_tests_step('panels-suite', edition=edition),
|
||||
|
||||
@@ -14,7 +14,7 @@ load(
|
||||
'test_backend_integration_step',
|
||||
'test_frontend_step',
|
||||
'package_step',
|
||||
'e2e_tests_server_step',
|
||||
'grafana_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
'build_frontend_docs_step',
|
||||
@@ -89,7 +89,7 @@ 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),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
grafana_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite', edition=edition),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
e2e_tests_step('panels-suite', edition=edition),
|
||||
|
||||
@@ -17,7 +17,7 @@ load(
|
||||
'build_frontend_step',
|
||||
'build_plugins_step',
|
||||
'package_step',
|
||||
'e2e_tests_server_step',
|
||||
'grafana_server_step',
|
||||
'e2e_tests_step',
|
||||
'build_storybook_step',
|
||||
'copy_packages_for_docker_step',
|
||||
@@ -222,7 +222,7 @@ def get_steps(edition, ver_mode):
|
||||
copy_packages_for_docker_step(),
|
||||
package_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
|
||||
package_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
|
||||
e2e_tests_server_step(edition=edition),
|
||||
grafana_server_step(edition=edition),
|
||||
])
|
||||
|
||||
if not disable_tests:
|
||||
|
||||
Reference in New Issue
Block a user