public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Move Grafana version generator in initialize step (#40604)

Browse Source 
* Move gen-version

* Small dependencies reorder

* Update grabpl version
This commit is contained in:
Dimitris Sotirakis
2021-10-21 09:59:12 +03:00
committed by GitHub
parent e54fe220e5
commit bb738e35cf
5 changed files with 92 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/pipelines/main.star
+2 -5
View File
@@ -10,7 +10,6 @@ load(
'build_backend_step',
'build_frontend_step',
'build_plugins_step',
'gen_version_step',
'package_step',
'e2e_tests_server_step',
'e2e_tests_step',
@@ -69,7 +68,6 @@ def get_steps(edition, is_downstream=False):
ensure_cuetsified_step(),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
@@ -81,8 +79,7 @@ def get_steps(edition, is_downstream=False):
# Insert remaining steps
steps.extend([
gen_version_step(ver_mode=ver_mode, is_downstream=is_downstream, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
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(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode),
@@ -109,7 +106,7 @@ def get_steps(edition, is_downstream=False):
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream),
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream),
e2e_tests_server_step(edition=edition2, port=3002),
e2e_tests_step(edition=edition2, port=3002),
upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
scripts/drone/pipelines/pr.star
+2 -5
View File
@@ -10,7 +10,6 @@ load(
'test_backend_step',
'test_backend_integration_step',
'test_frontend_step',
'gen_version_step',
'package_step',
'e2e_tests_server_step',
'e2e_tests_step',
@@ -61,7 +60,6 @@ def pr_pipelines(edition):
ensure_cuetsified_step(),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.append(benchmark_ldap_step())
@@ -75,8 +73,7 @@ def pr_pipelines(edition):
# Insert remaining steps
steps.extend([
gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode, variants=variants),
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants),
e2e_tests_server_step(edition=edition),
e2e_tests_step(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode),
@@ -93,7 +90,7 @@ def pr_pipelines(edition):
steps.extend([
redis_integration_tests_step(),
memcached_integration_tests_step(),
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
e2e_tests_server_step(edition=edition2, port=3002),
e2e_tests_step(edition=edition2, port=3002),
])
scripts/drone/pipelines/release.star
+2 -5
View File
@@ -13,7 +13,6 @@ load(
'build_backend_step',
'build_frontend_step',
'build_plugins_step',
'gen_version_step',
'package_step',
'e2e_tests_server_step',
'e2e_tests_step',
@@ -97,7 +96,6 @@ def get_steps(edition, ver_mode):
ensure_cuetsified_step(),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
@@ -109,8 +107,7 @@ def get_steps(edition, ver_mode):
# Insert remaining steps
steps.extend([
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, include_enterprise2=include_enterprise2),
e2e_tests_server_step(edition=edition),
e2e_tests_step(edition=edition, tries=3),
copy_packages_for_docker_step(),
@@ -142,7 +139,7 @@ def get_steps(edition, ver_mode):
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
e2e_tests_server_step(edition=edition2, port=3002),
e2e_tests_step(edition=edition2, port=3002, tries=3),
upload_cdn_step(edition=edition2),