mirror of
https://github.com/grafana/grafana.git
synced 2025-02-11 16:15:42 -06:00
Add RPM package publishing (#56797)
Just tested deb publishing, and confirmed it works. Noticed that RPM packages aren't published though It's the exact same step, targetting the RPM files instead Both steps will run in parallel Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
This commit is contained in:
parent
d2abcbe4a5
commit
44ad4ec9d4
50
.drone.yml
50
.drone.yml
@ -3795,7 +3795,7 @@ steps:
|
|||||||
- grabpl
|
- grabpl
|
||||||
failure: ignore
|
failure: ignore
|
||||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||||
name: publish-linux-packages
|
name: publish-linux-packages-deb
|
||||||
privileged: true
|
privileged: true
|
||||||
settings:
|
settings:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
@ -3813,6 +3813,28 @@ steps:
|
|||||||
service_account_json:
|
service_account_json:
|
||||||
from_secret: packages_service_account
|
from_secret: packages_service_account
|
||||||
target_bucket: grafana-packages
|
target_bucket: grafana-packages
|
||||||
|
- depends_on:
|
||||||
|
- grabpl
|
||||||
|
failure: ignore
|
||||||
|
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||||
|
name: publish-linux-packages-rpm
|
||||||
|
privileged: true
|
||||||
|
settings:
|
||||||
|
access_key_id:
|
||||||
|
from_secret: packages_access_key_id
|
||||||
|
deb_distribution: stable
|
||||||
|
gpg_passphrase:
|
||||||
|
from_secret: packages_gpg_passphrase
|
||||||
|
gpg_private_key:
|
||||||
|
from_secret: packages_gpg_private_key
|
||||||
|
gpg_public_key:
|
||||||
|
from_secret: packages_gpg_public_key
|
||||||
|
package_path: gs://grafana-prerelease/artifacts/downloads/*${DRONE_TAG}/oss/**.rpm
|
||||||
|
secret_access_key:
|
||||||
|
from_secret: packages_secret_access_key
|
||||||
|
service_account_json:
|
||||||
|
from_secret: packages_service_account
|
||||||
|
target_bucket: grafana-packages
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- promote
|
- promote
|
||||||
@ -3884,7 +3906,7 @@ steps:
|
|||||||
- grabpl
|
- grabpl
|
||||||
failure: ignore
|
failure: ignore
|
||||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||||
name: publish-linux-packages
|
name: publish-linux-packages-deb
|
||||||
privileged: true
|
privileged: true
|
||||||
settings:
|
settings:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
@ -3902,6 +3924,28 @@ steps:
|
|||||||
service_account_json:
|
service_account_json:
|
||||||
from_secret: packages_service_account
|
from_secret: packages_service_account
|
||||||
target_bucket: grafana-packages
|
target_bucket: grafana-packages
|
||||||
|
- depends_on:
|
||||||
|
- grabpl
|
||||||
|
failure: ignore
|
||||||
|
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||||
|
name: publish-linux-packages-rpm
|
||||||
|
privileged: true
|
||||||
|
settings:
|
||||||
|
access_key_id:
|
||||||
|
from_secret: packages_access_key_id
|
||||||
|
deb_distribution: stable
|
||||||
|
gpg_passphrase:
|
||||||
|
from_secret: packages_gpg_passphrase
|
||||||
|
gpg_private_key:
|
||||||
|
from_secret: packages_gpg_private_key
|
||||||
|
gpg_public_key:
|
||||||
|
from_secret: packages_gpg_public_key
|
||||||
|
package_path: gs://grafana-prerelease/artifacts/downloads/*${DRONE_TAG}/enterprise/**.rpm
|
||||||
|
secret_access_key:
|
||||||
|
from_secret: packages_secret_access_key
|
||||||
|
service_account_json:
|
||||||
|
from_secret: packages_service_account
|
||||||
|
target_bucket: grafana-packages
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- promote
|
- promote
|
||||||
@ -5570,6 +5614,6 @@ kind: secret
|
|||||||
name: packages_secret_access_key
|
name: packages_secret_access_key
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: 3d2d6935ad24bc885ba5b2ba3ca1547113783d39caebd4a5eb6dd73fc3333eb8
|
hmac: c64b7293490c926f8813dc04cf93ab930b145d03861d50786ada158af70c63bb
|
||||||
|
|
||||||
...
|
...
|
||||||
|
@ -390,7 +390,8 @@ def publish_packages_pipeline():
|
|||||||
compile_build_cmd(),
|
compile_build_cmd(),
|
||||||
publish_packages_step(edition='oss', ver_mode='release'),
|
publish_packages_step(edition='oss', ver_mode='release'),
|
||||||
publish_grafanacom_step(edition='oss', ver_mode='release'),
|
publish_grafanacom_step(edition='oss', ver_mode='release'),
|
||||||
publish_linux_packages_step(edition='oss'),
|
publish_linux_packages_step(edition='oss', package_manager='deb'),
|
||||||
|
publish_linux_packages_step(edition='oss', package_manager='rpm'),
|
||||||
]
|
]
|
||||||
|
|
||||||
enterprise_steps = [
|
enterprise_steps = [
|
||||||
@ -398,7 +399,8 @@ def publish_packages_pipeline():
|
|||||||
compile_build_cmd(),
|
compile_build_cmd(),
|
||||||
publish_packages_step(edition='enterprise', ver_mode='release'),
|
publish_packages_step(edition='enterprise', ver_mode='release'),
|
||||||
publish_grafanacom_step(edition='enterprise', ver_mode='release'),
|
publish_grafanacom_step(edition='enterprise', ver_mode='release'),
|
||||||
publish_linux_packages_step(edition='enterprise'),
|
publish_linux_packages_step(edition='enterprise', package_manager='deb'),
|
||||||
|
publish_linux_packages_step(edition='enterprise', package_manager='rpm'),
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
'publish-artifacts-public',
|
'publish-artifacts-public',
|
||||||
|
@ -1044,9 +1044,9 @@ def publish_grafanacom_step(edition, ver_mode):
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
def publish_linux_packages_step(edition):
|
def publish_linux_packages_step(edition, package_manager='deb'):
|
||||||
return {
|
return {
|
||||||
'name': 'publish-linux-packages',
|
'name': 'publish-linux-packages-{}'.format(package_manager),
|
||||||
# See https://github.com/grafana/deployment_tools/blob/master/docker/package-publish/README.md for docs on that image
|
# 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',
|
'image': 'us.gcr.io/kubernetes-dev/package-publish:latest',
|
||||||
'depends_on': [
|
'depends_on': [
|
||||||
@ -1063,7 +1063,7 @@ def publish_linux_packages_step(edition):
|
|||||||
'gpg_passphrase': from_secret('packages_gpg_passphrase'),
|
'gpg_passphrase': from_secret('packages_gpg_passphrase'),
|
||||||
'gpg_public_key': from_secret('packages_gpg_public_key'),
|
'gpg_public_key': from_secret('packages_gpg_public_key'),
|
||||||
'gpg_private_key': from_secret('packages_gpg_private_key'),
|
'gpg_private_key': from_secret('packages_gpg_private_key'),
|
||||||
'package_path': 'gs://grafana-prerelease/artifacts/downloads/*${{DRONE_TAG}}/{}/**.deb'.format(edition)
|
'package_path': 'gs://grafana-prerelease/artifacts/downloads/*${{DRONE_TAG}}/{}/**.{}'.format(edition, package_manager)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user