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

Change from grabpl to build for grafana-com (#56434)

Browse Source
This commit is contained in:
Dimitris Sotirakis
2022-10-06 10:14:38 +03:00
committed by GitHub
parent fe1395a1ec
commit ec7d9e196e
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/drone/events/cron.star
View File

@@ -1,5 +1,5 @@
load('scripts/drone/vault.star', 'from_secret', 'pull_secret')
load('scripts/drone/steps/lib.star', 'publish_image', 'download_grabpl_step')
load('scripts/drone/steps/lib.star', 'publish_image', 'compile_build_cmd')
aquasec_trivy_image = 'aquasec/trivy:0.21.0'
@@ -7,7 +7,7 @@ def cronjobs(edition):
grafana_com_nightly_pipeline = cron_job_pipeline(
cronName='grafana-com-nightly',
name='grafana-com-nightly',
steps=[download_grabpl_step(),post_to_grafana_com_step()]
steps=[compile_build_cmd(),post_to_grafana_com_step()]
)
return [
scan_docker_image_pipeline(edition, 'latest'),
@@ -93,7 +93,7 @@ def post_to_grafana_com_step():
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
'GCP_KEY': from_secret('gcp_key'),
},
'depends_on': ['grabpl'],
'commands': ['./bin/grabpl publish grafana-com --edition oss'],
'depends_on': ['compile-build-cmd'],
'commands': ['./bin/build publish grafana-com --edition oss'],
}

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

@@ -404,6 +404,7 @@ def publish_packages_pipeline():
}
oss_steps = [
download_grabpl_step(),
compile_build_cmd(),
publish_packages_step(edition='oss', ver_mode='release'),
publish_grafanacom_step(edition='oss', ver_mode='release'),
publish_linux_packages_step(edition='oss'),
@@ -411,6 +412,7 @@ def publish_packages_pipeline():
enterprise_steps = [
download_grabpl_step(),
compile_build_cmd(),
publish_packages_step(edition='enterprise', ver_mode='release'),
publish_grafanacom_step(edition='enterprise', ver_mode='release'),
publish_linux_packages_step(edition='enterprise'),

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

@@ -1012,12 +1012,12 @@ def publish_packages_step(edition, ver_mode):
def publish_grafanacom_step(edition, ver_mode):
if ver_mode == 'release':
cmd = './bin/grabpl publish grafana-com --edition {} ${{DRONE_TAG}}'.format(
cmd = './bin/build publish grafana-com --edition {} ${{DRONE_TAG}}'.format(
edition,
)
elif ver_mode == 'main':
build_no = '${DRONE_BUILD_NUMBER}'
cmd = './bin/grabpl publish grafana-com --edition {} --build-id {}'.format(
cmd = './bin/build publish grafana-com --edition {} --build-id {}'.format(
edition, build_no,
)
else: