Build/CI: Make integration-tests depend on initialize (#40782)

* Make integration tests depend on initialize

* Reorder steps for better visualisation
This commit is contained in:
Dimitris Sotirakis
2021-10-21 22:28:57 +02:00
committed by GitHub
parent 8b6a07a313
commit 624d7631e6
6 changed files with 250 additions and 290 deletions
+2 -2
View File
@@ -61,6 +61,8 @@ def get_steps(edition, is_downstream=False):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_plugins_step(edition=edition, sign=True),
@@ -90,8 +92,6 @@ def get_steps(edition, is_downstream=False):
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=publish),
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=publish),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
])
if include_enterprise2:
+2 -2
View File
@@ -53,6 +53,8 @@ def pr_pipelines(edition):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition),
@@ -82,8 +84,6 @@ def pr_pipelines(edition):
build_docs_website_step(),
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64',]),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
])
if include_enterprise2:
+2 -2
View File
@@ -89,6 +89,8 @@ def get_steps(edition, ver_mode):
test_backend_step(edition=edition),
test_backend_integration_step(edition=edition),
test_frontend_step(),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition, sign=True),
@@ -113,8 +115,6 @@ def get_steps(edition, ver_mode):
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, ubuntu=True, publish=should_publish),
postgres_integration_tests_step(),
mysql_integration_tests_step(),
])
build_storybook = build_storybook_step(edition=edition, ver_mode=ver_mode)
+2 -6
View File
@@ -681,8 +681,7 @@ def postgres_integration_tests_step():
'name': 'postgres-integration-tests',
'image': build_image,
'depends_on': [
'test-backend',
'test-frontend',
'initialize',
],
'environment': {
'PGPASSWORD': 'grafanatest',
@@ -706,8 +705,7 @@ def mysql_integration_tests_step():
'name': 'mysql-integration-tests',
'image': build_image,
'depends_on': [
'test-backend',
'test-frontend',
'initialize',
],
'environment': {
'GRAFANA_TEST_DB': 'mysql',
@@ -795,8 +793,6 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
dependencies = [
'end-to-end-tests' + enterprise2_suffix(edition),
'mysql-integration-tests',
'postgres-integration-tests',
]
if edition in ('enterprise', 'enterprise2'):