Skip to content

Commit

Permalink
Revert "[CI] fight the flakiness with some retry option in the CI onl…
Browse files Browse the repository at this point in the history
…y for the Pull Requests (#26617)" (#26704)

This reverts commit fb3bac9.
  • Loading branch information
v1v committed Jul 5, 2021
1 parent 8c3f0d5 commit c0341a8
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

@Library('apm@current') _

def numberOfRetries = 1
// Only Pull Requests can rerun the build&test stages
if (env.CHANGE_ID?.trim()) {
numberOfRetries = 3
}

pipeline {
agent { label 'ubuntu-18 && immutable' }
environment {
Expand Down Expand Up @@ -107,10 +101,7 @@ pipeline {
}
}
stage('Build&Test') {
options {
skipDefaultCheckout()
retry(numberOfRetries)
}
options { skipDefaultCheckout() }
when {
// Always when running builds on branches/tags
// On a PR basis, skip if changes are only related to docs.
Expand All @@ -129,10 +120,7 @@ pipeline {
}
}
stage('Extended') {
options {
skipDefaultCheckout()
retry(numberOfRetries)
}
options { skipDefaultCheckout() }
when {
// Always when running builds on branches/tags
// On a PR basis, skip if changes are only related to docs.
Expand Down

0 comments on commit c0341a8

Please sign in to comment.