Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
fix: revert work for calculating reporter based on branch/pr (#470)
Browse files Browse the repository at this point in the history
* Revert "fix: move evaluation out of post section (#465)"

This reverts commit 3fd4896.

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

This reverts commit 948263f.
  • Loading branch information
mdelapenya authored Nov 25, 2020
1 parent 3fd4896 commit 0446248
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 0446248

Please sign in to comment.