From 0446248bae1ff604219735998841a21a7576bfdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 26 Nov 2020 00:01:39 +0100
Subject: [PATCH] fix: revert work for calculating reporter based on branch/pr
 (#470)

* Revert "fix: move evaluation out of post section (#465)"

This reverts commit 3fd4896c22c0165635981ffc45684e14eed42afc.

* Revert "chore: calculate reporter name from isPR or isBranch (#457)"

This reverts commit 948263ff1b9615210be7e28fdf52e55e169b4007.
---
 .ci/Jenkinsfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index dfadc41b8d..5f5d64857e 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -75,13 +75,6 @@ pipeline {
       stages {
         stage('Checkout') {
           steps {
-            whenTrue(isBranch()) {
-              setEnvVar("REPORTER_SUFFIX", env.BRANCH_NAME)
-            }
-            whenTrue(isPR()) {
-              setEnvVar("REPORTER_SUFFIX", env.CHANGE_TARGET)
-            }
-
             pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
             deleteDir()
             gitCheckout(basedir: BASE_DIR, githubNotifyFirstTimeContributor: true)
@@ -240,7 +233,7 @@ pipeline {
   post {
     cleanup {
       githubCheckNotify(currentBuild.currentResult == 'SUCCESS' ? 'SUCCESS' : 'FAILURE')
-      notifyBuildResult(analyzeFlakey: true, flakyReportIdx: "reporter-e2e-tests-end-2-end-tests-pipeline-${env.REPORTER_SUFFIX}", prComment: true)
+      notifyBuildResult(analyzeFlakey: true, flakyReportIdx: "reporter-e2e-tests-end-2-end-tests-pipeline-master", prComment: true)
     }
     success {
       whenTrue(!isPR() && params.notifyOnGreenBuilds) {