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),
scripts/drone/steps/lib.star
+14 -33
View File
@@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')
grabpl_version = '2.5.2'
grabpl_version = '2.5.5'
build_image = 'grafana/build-container:1.4.3'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@@ -48,9 +48,17 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
]
if ver_mode == 'release':
args = '${DRONE_TAG}'
common_cmds.append('./bin/grabpl verify-version ${DRONE_TAG}')
elif ver_mode == 'test-release':
args = test_release_ver
common_cmds.append('./bin/grabpl verify-version {}'.format(test_release_ver))
else:
if not is_downstream:
build_no = '${DRONE_BUILD_NUMBER}'
else:
build_no = '$${SOURCE_BUILD_NUMBER}'
args = '--build-id {}'.format(build_no)
identify_runner_step = {
'name': 'identify-runner',
@@ -62,6 +70,7 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
if install_deps:
common_cmds.extend([
'./bin/grabpl gen-version {}'.format(args),
'yarn install --immutable',
])
if edition in ('enterprise', 'enterprise2'):
@@ -184,7 +193,7 @@ def build_storybook_step(edition, ver_mode):
'image': build_image,
'depends_on': [
# Best to ensure that this step doesn't mess with what's getting built and packaged
'package',
'build-frontend',
],
'environment': {
'NODE_OPTIONS': '--max_old_space_size=4096',
@@ -500,13 +509,11 @@ def shellcheck_step():
],
}
def gen_version_step(ver_mode, include_enterprise2=False, is_downstream=False):
def package_step(edition, ver_mode, include_enterprise2=False, variants=None, is_downstream=False):
deps = [
'build-plugins',
'build-backend',
'build-frontend',
'codespell',
'shellcheck',
]
if include_enterprise2:
sfx = '-enterprise2'
@@ -515,28 +522,6 @@ def gen_version_step(ver_mode, include_enterprise2=False, is_downstream=False):
'test-backend' + sfx,
])
if ver_mode == 'release':
args = '${DRONE_TAG}'
elif ver_mode == 'test-release':
args = test_release_ver
else:
if not is_downstream:
build_no = '${DRONE_BUILD_NUMBER}'
else:
build_no = '$${SOURCE_BUILD_NUMBER}'
args = '--build-id {}'.format(build_no)
return {
'name': 'gen-version',
'image': build_image,
'depends_on': deps,
'commands': [
'./bin/grabpl gen-version {}'.format(args),
],
}
def package_step(edition, ver_mode, variants=None, is_downstream=False):
variants_str = ''
if variants:
variants_str = ' --variants {}'.format(','.join(variants))
@@ -584,11 +569,7 @@ def package_step(edition, ver_mode, variants=None, is_downstream=False):
return {
'name': 'package' + enterprise2_suffix(edition),
'image': build_image,
'depends_on': [
# This step should have all the dependencies required for packaging, and should generate
# dist/grafana.version
'gen-version',
],
'depends_on': deps,
'environment': env,
'commands': cmds,
}
@@ -661,7 +642,7 @@ def copy_packages_for_docker_step():
'name': 'copy-packages-for-docker',
'image': build_image,
'depends_on': [
'end-to-end-tests-server',
'package',
],
'commands': [
'ls dist/*.tar.gz*',