IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: Generate Grafana version (and metadata) when the build binary is built (#54393)

Browse Source 
* Add GenerateVersions as BeforeFunc

* Delete gen-version

* Fix lint

* Get build id from env var
This commit is contained in:
Dimitris Sotirakis
2022-09-01 15:43:40 +03:00
committed by GitHub
parent 4ec03bad64
commit 7e2238cf6f
13 changed files with 128 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/drone/events/release.star
View File

@@ -3,7 +3,6 @@ load(
'disable_tests',
'clone_enterprise_step',
'download_grabpl_step',
'gen_version_step',
'yarn_install_step',
'wire_install_step',
'init_enterprise_step',
@@ -164,7 +163,6 @@ def get_steps(edition, ver_mode):
init_steps = [
identify_runner_step(),
download_grabpl_step(),
gen_version_step(ver_mode),
verify_gen_cue_step(edition),
wire_install_step(),
yarn_install_step(),
@@ -312,7 +310,7 @@ def get_enterprise_pipelines(trigger, ver_mode):
init_enterprise_step(ver_mode),
compile_build_cmd(edition),
]
for step in [wire_install_step(), yarn_install_step(), gen_version_step(ver_mode), verify_gen_cue_step(edition)]:
for step in [wire_install_step(), yarn_install_step(), verify_gen_cue_step(edition)]:
step.update(deps_on_clone_enterprise_step)
init_steps.extend([step])
@@ -392,7 +390,6 @@ def publish_packages_pipeline():
}
oss_steps = [
download_grabpl_step(),
gen_version_step(ver_mode='release'),
publish_packages_step(edition='oss', ver_mode='release'),
publish_grafanacom_step(edition='oss', ver_mode='release'),
publish_linux_packages_step(edition='oss'),
@@ -400,7 +397,6 @@ def publish_packages_pipeline():
enterprise_steps = [
download_grabpl_step(),
gen_version_step(ver_mode='release'),
publish_packages_step(edition='enterprise', ver_mode='release'),
publish_grafanacom_step(edition='enterprise', ver_mode='release'),
publish_linux_packages_step(edition='enterprise'),

2
scripts/drone/pipelines/build.star
View File

@@ -3,7 +3,6 @@ load(
'download_grabpl_step',
'build_image',
'identify_runner_step',
'gen_version_step',
'wire_install_step',
'yarn_install_step',
'build_backend_step',
@@ -49,7 +48,6 @@ def build_e2e(trigger, ver_mode, edition):
identify_runner_step(),
download_grabpl_step(),
compile_build_cmd(),
gen_version_step(ver_mode),
verify_gen_cue_step(edition="oss"),
wire_install_step(),
yarn_install_step(),

2
scripts/drone/pipelines/docs.star
View File

@@ -3,7 +3,6 @@ load(
'build_image',
'yarn_install_step',
'identify_runner_step',
'gen_version_step',
'download_grabpl_step',
'lint_frontend_step',
'codespell_step',
@@ -39,7 +38,6 @@ def docs_pipelines(edition, ver_mode, trigger):
steps = [
download_grabpl_step(),
identify_runner_step(),
gen_version_step(ver_mode),
yarn_install_step(),
codespell_step(),
lint_docs(),

2
scripts/drone/pipelines/publish.star
View File

@@ -1,7 +1,6 @@
load(
'scripts/drone/steps/lib.star',
'identify_runner_step',
'gen_version_step',
'download_grabpl_step',
'publish_packages_step',
'compile_build_cmd',
@@ -15,7 +14,6 @@ load(
def publish(trigger, ver_mode, edition):
steps = [
download_grabpl_step(),
gen_version_step(ver_mode),
compile_build_cmd(),
identify_runner_step(),
publish_packages_step(edition=edition, ver_mode=ver_mode),

2
scripts/drone/pipelines/test_backend.star
View File

@@ -2,7 +2,6 @@ load(
'scripts/drone/steps/lib.star',
'identify_runner_step',
'download_grabpl_step',
'gen_version_step',
'wire_install_step',
'codespell_step',
'shellcheck_step',
@@ -24,7 +23,6 @@ def test_backend(trigger, ver_mode):
identify_runner_step(),
download_grabpl_step(),
compile_build_cmd(),
gen_version_step(ver_mode),
verify_gen_cue_step(edition="oss"),
wire_install_step(),
]

2
scripts/drone/pipelines/test_frontend.star
View File

@@ -2,7 +2,6 @@ load(
'scripts/drone/steps/lib.star',
'identify_runner_step',
'download_grabpl_step',
'gen_version_step',
'yarn_install_step',
'lint_frontend_step',
'betterer_frontend_step',
@@ -19,7 +18,6 @@ def test_frontend(trigger, ver_mode):
init_steps = [
identify_runner_step(),
download_grabpl_step(),
gen_version_step(ver_mode),
yarn_install_step(),
compile_build_cmd(),
]

1
scripts/drone/pipelines/windows.star
View File

@@ -55,7 +55,6 @@ def windows(trigger, edition, ver_mode):
'release',
):
installer_commands.extend([
'.\\grabpl.exe gen-version {}'.format(ver_part),
'.\\grabpl.exe windows-installer --edition {} {}'.format(edition, ver_part),
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
])

28
scripts/drone/steps/lib.star
View File

@@ -30,25 +30,6 @@ def slack_step(channel, template, secret):
},
}
def gen_version_step(ver_mode):
if ver_mode == 'release':
args = '${DRONE_TAG}'
else:
build_no = '${DRONE_BUILD_NUMBER}'
args = '--build-id {}'.format(build_no)
return {
'name': 'gen-version',
'image': build_image,
'depends_on': [
'grabpl',
],
'commands': [
'./bin/grabpl gen-version {}'.format(args),
],
}
def yarn_install_step():
return {
'name': 'yarn-install',
@@ -392,7 +373,6 @@ def build_backend_step(edition, ver_mode, variants=None):
'name': 'build-backend' + enterprise2_suffix(edition),
'image': build_image,
'depends_on': [
'gen-version',
'wire-install',
'compile-build-cmd',
],
@@ -423,7 +403,6 @@ def build_frontend_step(edition, ver_mode):
},
'depends_on': [
'compile-build-cmd',
'gen-version',
'yarn-install',
],
'commands': cmds,
@@ -452,7 +431,6 @@ def build_frontend_package_step(edition, ver_mode):
'NODE_OPTIONS': '--max_old_space_size=8192',
},
'depends_on': [
'gen-version',
'yarn-install',
],
'commands': cmds,
@@ -484,7 +462,6 @@ def build_plugins_step(edition, ver_mode):
'image': build_image,
'environment': env,
'depends_on': [
'gen-version',
'yarn-install',
],
'commands': [
@@ -1014,7 +991,7 @@ def publish_packages_step(edition, ver_mode):
'name': 'publish-packages-{}'.format(edition),
'image': publish_image,
'depends_on': [
'gen-version',
'grabpl',
],
'environment': {
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
@@ -1061,7 +1038,7 @@ def publish_linux_packages_step(edition):
# See https://github.com/grafana/deployment_tools/blob/master/docker/package-publish/README.md for docs on that image
'image': 'us.gcr.io/kubernetes-dev/package-publish:latest',
'depends_on': [
'gen-version'
'grabpl'
],
'failure': 'ignore', # While we're testing it
'settings': {
@@ -1121,7 +1098,6 @@ def get_windows_steps(edition, ver_mode):
'release',
):
installer_commands.extend([
'.\\grabpl.exe gen-version {}'.format(ver_part),
'.\\grabpl.exe windows-installer --edition {} {}'.format(edition, ver_part),
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
])