From 6c50cad3e867edd864dd07265443799712fa0479 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 27 Mar 2023 11:19:00 +0300
Subject: [PATCH] [v9.2.x] CI: Remove `grabpl` dependency from
 `publish-packages` steps (#65329) (#65331)

CI: Remove `grabpl` dependency from `publish-packages` steps (#65329)

Remove grabpl dependency from publish packages

(cherry picked from commit 3b00d2c273d5b7622b225ae56381879b60a10c2a)

# Conflicts:
#	.drone.yml
---
 .drone.yml                        | 22 +++++-----------------
 scripts/drone/events/release.star |  2 --
 scripts/drone/steps/lib.star      |  2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c4c436a09e4..1b499fd3e28 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4485,12 +4485,6 @@ platform:
   os: linux
 services: []
 steps:
-- commands:
-  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
-  - chmod +x bin/grabpl
-  image: byrnedo/alpine-curl:0.1.8
-  name: grabpl
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
@@ -4499,7 +4493,7 @@ steps:
   image: golang:1.19.4
   name: compile-build-cmd
 - depends_on:
-  - grabpl
+  - compile-build-cmd
   image: us.gcr.io/kubernetes-dev/package-publish:latest
   name: publish-linux-packages-deb
   privileged: true
@@ -4520,7 +4514,7 @@ steps:
       from_secret: packages_service_account
     target_bucket: grafana-packages
 - depends_on:
-  - grabpl
+  - compile-build-cmd
   image: us.gcr.io/kubernetes-dev/package-publish:latest
   name: publish-linux-packages-rpm
   privileged: true
@@ -4582,12 +4576,6 @@ platform:
   os: linux
 services: []
 steps:
-- commands:
-  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
-  - chmod +x bin/grabpl
-  image: byrnedo/alpine-curl:0.1.8
-  name: grabpl
 - commands:
   - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
   depends_on: []
@@ -4596,7 +4584,7 @@ steps:
   image: golang:1.19.4
   name: compile-build-cmd
 - depends_on:
-  - grabpl
+  - compile-build-cmd
   image: us.gcr.io/kubernetes-dev/package-publish:latest
   name: publish-linux-packages-deb
   privileged: true
@@ -4617,7 +4605,7 @@ steps:
       from_secret: packages_service_account
     target_bucket: grafana-packages
 - depends_on:
-  - grabpl
+  - compile-build-cmd
   image: us.gcr.io/kubernetes-dev/package-publish:latest
   name: publish-linux-packages-rpm
   privileged: true
@@ -6534,6 +6522,6 @@ kind: secret
 name: enterprise2_security_prefix
 ---
 kind: signature
-hmac: ddbb4b9b753132c24db6de4d57ccd2f5a05ceebe9eaf32a12f34c86372cf37ef
+hmac: 3f77e38d0e3fd91f9a878e40fae2ba397747af28aaf5db7b91625b57fdd75398
 
 ...
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index e6fb5d9c08e..1c3374367a5 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -574,7 +574,6 @@ def publish_packages_pipeline():
         "target": ["public"],
     }
     oss_steps = [
-        download_grabpl_step(),
         compile_build_cmd(),
         publish_linux_packages_step(edition = "oss", package_manager = "deb"),
         publish_linux_packages_step(edition = "oss", package_manager = "rpm"),
@@ -582,7 +581,6 @@ def publish_packages_pipeline():
     ]
 
     enterprise_steps = [
-        download_grabpl_step(),
         compile_build_cmd(),
         publish_linux_packages_step(edition = "enterprise", package_manager = "deb"),
         publish_linux_packages_step(edition = "enterprise", package_manager = "rpm"),
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 37eb597488a..8c3a2c79ae8 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1268,7 +1268,7 @@ def publish_linux_packages_step(edition, package_manager = "deb"):
         "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": ["grabpl"],
+        "depends_on": ["compile-build-cmd"],
         "privileged": True,
         "settings": {
             "access_key_id": from_secret("packages_access_key_id"),