From 25a6dd88a8ea6e4ed8210d894943d448806d9a42 Mon Sep 17 00:00:00 2001
From: dsotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 5 Oct 2022 14:29:14 +0300
Subject: [PATCH] Remove remote addition

---
 .drone.yml                   | 12 +++++-------
 scripts/drone/steps/lib.star |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 30259726dd7..317d22892de 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -370,9 +370,8 @@ steps:
     && git push origin $${TEST_TAG}
   - cd -
   - git fetch origin "refs/tags/*:refs/tags/*"
-  - git remote add downstream https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git
-  - git tag -d $${TEST_TAG} && git push --delete downstream --quiet $${TEST_TAG} &&
-    git tag $${TEST_TAG} && git push downstream $${TEST_TAG} --quiet
+  - git tag -d $${TEST_TAG} && git push --delete origin --quiet $${TEST_TAG} && git
+    tag $${TEST_TAG} && git push origin $${TEST_TAG} --quiet
   environment:
     DOWNSTREAM_REPO:
       from_secret: downstream
@@ -1231,9 +1230,8 @@ steps:
     && git push origin $${TEST_TAG}
   - cd -
   - git fetch origin "refs/tags/*:refs/tags/*"
-  - git remote add downstream https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git
-  - git tag -d $${TEST_TAG} && git push --delete downstream --quiet $${TEST_TAG} &&
-    git tag $${TEST_TAG} && git push downstream $${TEST_TAG} --quiet
+  - git tag -d $${TEST_TAG} && git push --delete origin --quiet $${TEST_TAG} && git
+    tag $${TEST_TAG} && git push origin $${TEST_TAG} --quiet
   environment:
     DOWNSTREAM_REPO:
       from_secret: downstream
@@ -5328,6 +5326,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 31fbe97765960b69214b14b9a2514ff7f6441a4e6d18636c47e7e0989a896fde
+hmac: 990990c9907087beb421d251068f41695046fcbb8ea660e863cd7c7ece251267
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 0eb41b321f0..47ce70e01c8 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1209,8 +1209,7 @@ def trigger_test_release():
             'git tag -d $${TEST_TAG} && git push --delete origin $${TEST_TAG} && git tag $${TEST_TAG} && git push origin $${TEST_TAG}',
             'cd -',
             'git fetch origin "refs/tags/*:refs/tags/*"',
-            'git remote add downstream https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git',
-            'git tag -d $${TEST_TAG} && git push --delete downstream --quiet $${TEST_TAG} && git tag $${TEST_TAG} && git push downstream $${TEST_TAG} --quiet',
+            'git tag -d $${TEST_TAG} && git push --delete origin --quiet $${TEST_TAG} && git tag $${TEST_TAG} && git push origin $${TEST_TAG} --quiet',
         ],
         'failure': 'ignore',
         'when': {