From 8974846bf263e41c77294c57a27303ae1f3fdcb6 Mon Sep 17 00:00:00 2001
From: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
Date: Thu, 1 May 2025 09:32:35 -0500
Subject: [PATCH] CI: Use docker creds from ci/common (#104827)

Use docker creds from ci/common

(cherry picked from commit fd4afdbd2cd2d0cc466d42d101003e870b4ff93f)
---
 .drone.yml               | 8 ++++++--
 scripts/drone/vault.star | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5a7dab896bc..d3028327841 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4699,13 +4699,13 @@ name: prerelease_bucket
 ---
 get:
   name: username
-  path: infra/data/ci/grafanaci-docker-hub
+  path: ci/data/common/dockerhub
 kind: secret
 name: docker_username
 ---
 get:
   name: password
-  path: infra/data/ci/grafanaci-docker-hub
+  path: ci/data/common/dockerhub
 kind: secret
 name: docker_password
 ---
@@ -4836,6 +4836,10 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
+<<<<<<< HEAD
 hmac: 32062cc16a9cda77f033fcc9d3d68eb488b436de68b787dd904a4c37885c04a3
+=======
+hmac: 38513409bb4d2834e2140e41a9873c81052683ad8d9c86f3136060c44d099b6f
+>>>>>>> fd4afdbd2c (CI: Use docker creds from ci/common (#104827))
 
 ...
diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star
index a79f3c7324d..05f3617d01f 100644
--- a/scripts/drone/vault.star
+++ b/scripts/drone/vault.star
@@ -55,8 +55,8 @@ def secrets():
         vault_secret(gar_pull_secret, "secret/data/common/gar", ".dockerconfigjson"),
         vault_secret(drone_token, "infra/data/ci/drone", "machine-user-token"),
         vault_secret(prerelease_bucket, "infra/data/ci/grafana/prerelease", "bucket"),
-        vault_secret(docker_username, "infra/data/ci/grafanaci-docker-hub", "username"),
-        vault_secret(docker_password, "infra/data/ci/grafanaci-docker-hub", "password"),
+        vault_secret(docker_username, "ci/data/common/dockerhub", "username"),
+        vault_secret(docker_password, "ci/data/common/dockerhub", "password"),
         vault_secret(
             gcp_upload_artifacts_key,
             "infra/data/ci/grafana/releng/artifacts-uploader-service-account",