mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
DEB/RPM Packages: Remove old package publishing steps (#58071)
* Remove old publish package steps * Don't ignore publish packaging failures
This commit is contained in:
committed by
GitHub
parent
9e03355e53
commit
7a12132237
@@ -974,37 +974,6 @@ def upload_packages_step(edition, ver_mode, trigger=None):
|
||||
return step
|
||||
|
||||
|
||||
def publish_packages_step(edition, ver_mode):
|
||||
if ver_mode == 'release':
|
||||
cmd = './bin/build publish packages --edition {} --gcp-key /tmp/gcpkey.json ${{DRONE_TAG}}'.format(
|
||||
edition,
|
||||
)
|
||||
elif ver_mode == 'main':
|
||||
build_no = '${DRONE_BUILD_NUMBER}'
|
||||
cmd = './bin/build publish packages --edition {} --gcp-key /tmp/gcpkey.json --build-id {}'.format(
|
||||
edition, build_no,
|
||||
)
|
||||
else:
|
||||
fail('Unexpected version mode {}'.format(ver_mode))
|
||||
|
||||
return {
|
||||
'name': 'publish-packages-{}'.format(edition),
|
||||
'image': publish_image,
|
||||
'depends_on': [
|
||||
'compile-build-cmd',
|
||||
],
|
||||
'environment': {
|
||||
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
|
||||
'GCP_KEY': from_secret('gcp_key'),
|
||||
'GPG_PRIV_KEY': from_secret('gpg_priv_key'),
|
||||
'GPG_PUB_KEY': from_secret('gpg_pub_key'),
|
||||
'GPG_KEY_PASSWORD': from_secret('gpg_key_password'),
|
||||
},
|
||||
'commands': [
|
||||
cmd,
|
||||
],
|
||||
}
|
||||
|
||||
def publish_grafanacom_step(edition, ver_mode):
|
||||
if ver_mode == 'release':
|
||||
cmd = './bin/build publish grafana-com --edition {} ${{DRONE_TAG}}'.format(
|
||||
@@ -1022,7 +991,8 @@ def publish_grafanacom_step(edition, ver_mode):
|
||||
'name': 'publish-grafanacom-{}'.format(edition),
|
||||
'image': publish_image,
|
||||
'depends_on': [
|
||||
'publish-packages-{}'.format(edition),
|
||||
'publish-linux-packages-deb',
|
||||
'publish-linux-packages-rpm',
|
||||
],
|
||||
'environment': {
|
||||
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
|
||||
@@ -1042,7 +1012,6 @@ def publish_linux_packages_step(edition, package_manager='deb'):
|
||||
'grabpl'
|
||||
],
|
||||
'privileged': True,
|
||||
'failure': 'ignore', # While we're testing it
|
||||
'settings': {
|
||||
'access_key_id': from_secret('packages_access_key_id'),
|
||||
'secret_access_key': from_secret('packages_secret_access_key'),
|
||||
|
||||
Reference in New Issue
Block a user