DEB/RPM Packages: Remove old package publishing steps (#58071)

* Remove old publish package steps

* Don't ignore publish packaging failures

scripts/drone/events/main.star

@@ -37,11 +37,6 @@ load(
     'windows',
 )
 
-load(
-    'scripts/drone/pipelines/publish.star',
-    'publish',
-)
-
 load(
     'scripts/drone/pipelines/trigger_downstream.star',
     'enterprise_downstream_pipeline',
@@ -103,11 +98,10 @@ def main_pipelines(edition):
         name='notify-drone-changes', slack_channel='slack-webhooks-test', trigger=drone_change_trigger,
         template=drone_change_template, secret='drone-changes-webhook',
     ),
-    publish(trigger, ver_mode, edition),
     enterprise_downstream_pipeline(edition, ver_mode),
     notify_pipeline(
         name='main-notify', slack_channel='grafana-ci-notifications', trigger=dict(trigger, status=['failure']),
-        depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows', 'main-publish'],
+        depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows'],
         template=failure_template, secret='slack_webhook'
     )]
 

scripts/drone/events/release.star

@@ -34,7 +34,6 @@ load(
     'benchmark_ldap_step',
     'store_storybook_step',
     'upload_packages_step',
-    'publish_packages_step',
     'publish_grafanacom_step',
     'upload_cdn_step',
     'verify_gen_cue_step',
@@ -387,19 +386,17 @@ 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', package_manager='deb'),
         publish_linux_packages_step(edition='oss', package_manager='rpm'),
+        publish_grafanacom_step(edition='oss', ver_mode='release'),
     ]
 
     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', package_manager='deb'),
         publish_linux_packages_step(edition='enterprise', package_manager='rpm'),
+        publish_grafanacom_step(edition='enterprise', ver_mode='release'),
     ]
     deps = [
         'publish-artifacts-public',

scripts/drone/pipelines/publish.star

@@ -1,25 +0,0 @@
-load(
-    'scripts/drone/steps/lib.star',
-    'identify_runner_step',
-    'download_grabpl_step',
-    'publish_packages_step',
-    'compile_build_cmd',
-)
-
-load(
-    'scripts/drone/utils/utils.star',
-    'pipeline',
-)
-
-def publish(trigger, ver_mode, edition):
-    steps = [
-        download_grabpl_step(),
-        compile_build_cmd(),
-        identify_runner_step(),
-        publish_packages_step(edition=edition, ver_mode=ver_mode),
-    ]
-    return pipeline(
-                   name='main-publish', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']),
-                   steps=steps,
-                   depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows', ],
-               )

scripts/drone/pipelines/trigger_downstream.star

@@ -22,7 +22,7 @@ trigger = {
 
 def enterprise_downstream_pipeline(edition, ver_mode):
     steps = [enterprise_downstream_step(edition, ver_mode)]
-    deps = ['main-publish']
+    deps = ['main-build-e2e-publish', 'main-integration-tests']
     return pipeline(
                 name='main-trigger-downstream', edition=edition, trigger=trigger, services=[], steps=steps, depends_on=deps
         )

scripts/drone/steps/lib.star

@@ -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'),