From bd2b4e956bd2fdfd063017856809f4d90118f31e Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Tue, 24 Oct 2023 10:52:14 +0200
Subject: [PATCH] =?UTF-8?q?CI:=20rgm-package=20must=20wait=20for=20update-?=
 =?UTF-8?q?package-json-version=20in=20main=20pip=E2=80=A6=20(#77022)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CI: rgm-package must wait for update-package-json-version in main pipeline
---
 .drone.yml                         | 4 ++--
 scripts/drone/pipelines/build.star | 3 ++-
 scripts/drone/steps/rgm.star       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ed10ff276f3..ead82b92296 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1748,7 +1748,7 @@ steps:
     --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
     > packages.txt
   depends_on:
-  - yarn-install
+  - update-package-json-version
   image: grafana/grafana-build:main
   name: rgm-package
   pull: always
@@ -4607,6 +4607,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: a23a1640b21a7e8dd62089ab21b84a4efc43504cd6e956dd0f49e56df4f4e5a2
+hmac: 93de8a710e23d3f1d31860f9eed34cd841b0a0eb48637971de4e8ce60a7c3df1
 
 ...
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 88b5ed8e52a..ee60b7b5103 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -70,17 +70,18 @@ def build_e2e(trigger, ver_mode):
             [
                 build_frontend_package_step(),
                 enterprise_downstream_step(ver_mode = ver_mode),
+                rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
             ],
         )
     else:
         build_steps.extend([
             update_package_json_version(),
             build_frontend_package_step(depends_on = ["update-package-json-version"]),
+            rgm_package_step(depends_on = ["update-package-json-version"], distros = "linux/amd64,linux/arm64", file = "packages.txt"),
         ])
 
     build_steps.extend(
         [
-            rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
             grafana_server_step(),
             e2e_tests_step("dashboards-suite"),
             e2e_tests_step("smoke-tests-suite"),
diff --git a/scripts/drone/steps/rgm.star b/scripts/drone/steps/rgm.star
index 495b443e4a0..6d86ac48b34 100644
--- a/scripts/drone/steps/rgm.star
+++ b/scripts/drone/steps/rgm.star
@@ -9,12 +9,12 @@ load(
 )
 
 # rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities..
-def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"):
+def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt", depends_on = ["yarn-install"]):
     return {
         "name": "rgm-package",
         "image": "grafana/grafana-build:main",
         "pull": "always",
-        "depends_on": ["yarn-install"],
+        "depends_on": depends_on,
         "commands": [
             "/src/grafana-build package --distro={} ".format(distros) +
             "--go-version={} ".format(golang_version) +