From 27f072beb3eba59707901bdc72adf3bca1b6dca5 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Mon, 17 Oct 2022 12:27:10 +0300
Subject: [PATCH] Don't trigger tag event when merging (#57063)

---
 .drone.yml                         | 34 +-----------------------------
 scripts/drone/pipelines/build.star |  3 +--
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c75b8a30fc0..d1a9989e54a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1182,38 +1182,6 @@ steps:
   depends_on: []
   image: grafana/build-container:1.6.3
   name: yarn-install
-- commands:
-  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-    --depth=1
-  - cd grafana-enterprise
-  - git fetch origin "refs/tags/*:refs/tags/*" --quiet
-  - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
-    push --delete origin $${TEST_TAG}; fi
-  - git tag $${TEST_TAG} && git push origin $${TEST_TAG}
-  - cd -
-  - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
-    --quiet && git fetch --quiet
-  - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
-    push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
-    fi
-  - git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git
-    $${TEST_TAG}
-  environment:
-    DOWNSTREAM_REPO:
-      from_secret: downstream
-    GITHUB_TOKEN:
-      from_secret: github_token_pr
-    TEST_TAG: v0.0.0-test
-  failure: ignore
-  image: grafana/build-container:1.6.3
-  name: trigger-test-release
-  when:
-    paths:
-      include:
-      - .drone.yml
-      - pkg/build/**
-    repo:
-    - grafana/grafana
 - commands:
   - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -5602,6 +5570,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: ead459950183bdae94b7e670d6bb883f3ff01775294324c43813fde99553f57d
+hmac: 7855c8576dd6072319a95a944c642df1d792bc90c3a71b38366196cc86d92d57
 
 ...
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 817350252c5..97d00666f4a 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -53,9 +53,8 @@ def build_e2e(trigger, ver_mode, edition):
         yarn_install_step(),
     ]
     build_steps = []
-    if ver_mode == 'main' or ver_mode == 'pr':
-        build_steps.extend([trigger_test_release()])
     if ver_mode == 'pr':
+        build_steps.extend([trigger_test_release()])
         build_steps.extend([enterprise_downstream_step(edition=edition, ver_mode=ver_mode)])
     build_steps.extend([
         build_backend_step(edition=edition, ver_mode=ver_mode),