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

CI: Abstract Grafana versioning (#50935)

Browse Source 
* Remove flags and update grabpl

* Sign drone yaml
This commit is contained in:
Dimitris Sotirakis
2022-07-07 13:41:27 +03:00
committed by GitHub
parent 99de3313f7
commit f279699beb
5 changed files with 69 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/pipelines/main.star
+1 -1
View File
@@ -126,7 +126,7 @@ def get_steps(edition):
build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_frontend_package_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition, sign=True),
build_plugins_step(edition=edition, ver_mode=ver_mode),
]
integration_test_steps = [
postgres_integration_tests_step(edition=edition, ver_mode=ver_mode),
scripts/drone/pipelines/pr.star
+2 -2
View File
@@ -123,10 +123,10 @@ def pr_pipelines(edition):
]
build_steps = [
enterprise_downstream_step(edition=edition, ver_mode=ver_mode),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_frontend_package_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition),
build_plugins_step(edition=edition, ver_mode=ver_mode),
]
integration_test_steps = [
postgres_integration_tests_step(edition=edition, ver_mode=ver_mode),
scripts/drone/pipelines/release.star
+1 -1
View File
@@ -180,7 +180,7 @@ def get_steps(edition, ver_mode):
build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode),
build_frontend_package_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition, sign=True),
build_plugins_step(edition=edition, ver_mode=ver_mode),
]
integration_test_steps = [
scripts/drone/steps/lib.star
+8 -11
View File
@@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = 'v2.9.50'
grabpl_version = 'v2.9.52'
build_image = 'grafana/build-container:1.5.7'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
@@ -367,7 +367,7 @@ def upload_cdn_step(edition, ver_mode, trigger=None):
'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
},
'commands': [
'./bin/grabpl upload-cdn --edition {} --src-bucket "{}"{}'.format(edition, bucket, src_dir),
'./bin/grabpl upload-cdn --edition {}'.format(edition),
],
}
if trigger and ver_mode in ("release-branch", "main"):
@@ -477,15 +477,13 @@ def build_frontend_docs_step(edition):
}
def build_plugins_step(edition, sign=False):
if sign:
def build_plugins_step(edition, ver_mode):
if ver_mode!='pr':
env = {
'GRAFANA_API_KEY': from_secret('grafana_api_key'),
}
sign_args = ' --sign --signing-admin'
else:
env = None
sign_args = ''
return {
'name': 'build-plugins',
'image': build_image,
@@ -496,7 +494,7 @@ def build_plugins_step(edition, sign=False):
],
'commands': [
# TODO: Use percentage for num jobs
'./bin/grabpl build-plugins --jobs 8 --edition {}{}'.format(edition, sign_args),
'./bin/grabpl build-plugins --jobs 8 --edition {}'.format(edition),
],
}
@@ -978,13 +976,12 @@ def upload_packages_step(edition, ver_mode, trigger=None):
return None
if ver_mode == 'release':
packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}'.format(enterprise2_suffix(edition))
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket {}'.format(edition, packages_bucket)
cmd = './bin/grabpl upload-packages --edition {}'.format(edition)
elif edition == 'enterprise2':
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads-enterprise2'.format(
cmd = './bin/grabpl upload-packages --edition {}'.format(
edition)
else:
cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)
cmd = './bin/grabpl upload-packages --edition {}'.format(edition)
deps = []
if edition in 'enterprise2' or not end_to_end_tests_deps(edition):