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>
(cherry picked from commit 44ad4ec9d4)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
This commit is contained in:
co-authored by
Julien Duchesne
parent
ef74b7a486
commit
04678bc1aa
+47
-3
@@ -3824,7 +3824,7 @@ steps:
|
||||
- grabpl
|
||||
failure: ignore
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages
|
||||
name: publish-linux-packages-deb
|
||||
privileged: true
|
||||
settings:
|
||||
access_key_id:
|
||||
@@ -3842,6 +3842,28 @@ steps:
|
||||
service_account_json:
|
||||
from_secret: packages_service_account_json
|
||||
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_json
|
||||
target_bucket: grafana-packages
|
||||
trigger:
|
||||
event:
|
||||
- promote
|
||||
@@ -3913,7 +3935,7 @@ steps:
|
||||
- grabpl
|
||||
failure: ignore
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages
|
||||
name: publish-linux-packages-deb
|
||||
privileged: true
|
||||
settings:
|
||||
access_key_id:
|
||||
@@ -3931,6 +3953,28 @@ steps:
|
||||
service_account_json:
|
||||
from_secret: packages_service_account_json
|
||||
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_json
|
||||
target_bucket: grafana-packages
|
||||
trigger:
|
||||
event:
|
||||
- promote
|
||||
@@ -5568,6 +5612,6 @@ kind: secret
|
||||
name: packages_secret_access_key
|
||||
---
|
||||
kind: signature
|
||||
hmac: be78a68a3d4dd858473d55a99c34a17c7f6e02a3abda533497a59a03e6ba67e6
|
||||
hmac: 9e279c40640c4c3485b124fa6d72b4eca52a5bcefff86c7d01d40e550cfe3315
|
||||
|
||||
...
|
||||
|
||||
@@ -390,7 +390,8 @@ def publish_packages_pipeline():
|
||||
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'),
|
||||
publish_linux_packages_step(edition='oss', package_manager='deb'),
|
||||
publish_linux_packages_step(edition='oss', package_manager='rpm'),
|
||||
]
|
||||
|
||||
enterprise_steps = [
|
||||
@@ -398,7 +399,8 @@ def publish_packages_pipeline():
|
||||
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'),
|
||||
publish_linux_packages_step(edition='enterprise', package_manager='deb'),
|
||||
publish_linux_packages_step(edition='enterprise', package_manager='rpm'),
|
||||
]
|
||||
deps = [
|
||||
'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 {
|
||||
'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
|
||||
'image': 'us.gcr.io/kubernetes-dev/package-publish:latest',
|
||||
'depends_on': [
|
||||
@@ -1063,7 +1063,7 @@ def publish_linux_packages_step(edition):
|
||||
'gpg_passphrase': from_secret('packages_gpg_passphrase'),
|
||||
'gpg_public_key': from_secret('packages_gpg_public_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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user