From c0341a8024b4b8b3400dfccc22ec2c4ec050fecb Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Mon, 5 Jul 2021 14:24:33 +0100
Subject: [PATCH] Revert "[CI] fight the flakiness with some retry option in
 the CI only for the Pull Requests (#26617)" (#26704)

This reverts commit fb3bac9036ec8fa99a69996118b8dde9fd449308.
---
 Jenkinsfile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aa41427ef7b..3070fba1903 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 {
@@ -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.
@@ -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.