Speed up builds with less sleeps steps

src/test/groovy/ApmBasePipelineTest.groovy

@@ -266,6 +266,7 @@ class ApmBasePipelineTest extends BasePipelineTest {
         }
       }
       if (lastError) {
+        updateBuildStatus('FAILURE')
         throw lastError
       }
     })

src/test/groovy/WithVaultTokenStepTests.groovy

@@ -80,9 +80,10 @@ class WithVaultTokenStepTests extends ApmBasePipelineTest {
       }
     } catch(e){
       //NOOP
+      assertTrue(e instanceof Exception)
+      assertTrue(e.toString().contains('Mock an error'))
     }
     printCallStack()
-    assertTrue(assertMethodCallContainsPattern('error', 'withVaultToken: error'))
     assertTrue(assertMethodCallContainsPattern('sh', 'rm .vault-token'))
     assertJobStatusFailure()
   }

vars/checkout.groovy

@@ -36,7 +36,11 @@ def call(params) {
 def retryWithSleep(int i, body) {
   retry(i) {
     log(level: 'DEBUG', text: "Let's checkout (${i} tries).")
-    sleep(20)
-    body()
+    try {
+      body()
+    } catch(e) {
+      sleep(20)
+      throw e
+    }
   }
 }

vars/dockerLogin.groovy

@@ -44,12 +44,18 @@ def call(Map params = [:]){
       "DOCKER_PASSWORD=${dockerPassword}"
     ]) {
       retry(3) {
-        sleep randomNumber(min: 5, max: 10)
-        sh(label: "Docker login", script: """
-        set +x
-        host ${registry} 2>&1 > /dev/null
-        docker login -u "\${DOCKER_USER}" -p "\${DOCKER_PASSWORD}" "${registry}" 2>/dev/null
-        """)
+        try {
+          sh(label: "Docker login", script: """
+            set +x
+            host ${registry} 2>&1 > /dev/null
+            docker login -u "\${DOCKER_USER}" -p "\${DOCKER_PASSWORD}" "${registry}" 2>/dev/null
+            """)
+        } catch(e) {
+          // When running in the CI with multiple parallel stages
+          // the access could be considered as a DDOS attack. Let's sleep a bit if it fails.
+          sleep randomNumber(min: 5, max: 10)
+          throw e
+        }
       }
     }
   }

vars/getVaultSecret.groovy

@@ -46,10 +46,16 @@ def readSecret(secret) {
   def props = null
   log(level: 'INFO', text: 'getVaultSecret: Getting secrets')
   readSecretWrapper() {
-    retry(2) {
-      sleep randomNumber(min: 5, max: 10)
-      def token = getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID)
-      props = getVaultSecretObject(env.VAULT_ADDR, secret, token)
+    retry(3) {
+      try {
+        def token = getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID)
+        props = getVaultSecretObject(env.VAULT_ADDR, secret, token)
+      } catch(e) {
+        // When running in the CI with multiple parallel stages
+        // the access could be considered as a DDOS attack. Let's sleep a bit if it fails.
+        sleep randomNumber(min: 2, max: 5)
+        throw e
+      }
     }
     //we do not have permissions to revoke a token.
     //revokeToken(env.VAULT_ADDR, token)

vars/git.groovy

@@ -36,7 +36,11 @@ def call(params) {
 def retryWithSleep(int i, body) {
   retry(i) {
     log(level: 'DEBUG', text: "Let's git (${i} tries).")
-    sleep(20)
-    body()
+    try {
+      body()
+    } catch(e) {
+      sleep(20)
+      throw e
+    }
   }
 }

vars/withVaultToken.groovy

@@ -27,16 +27,17 @@ def call(Map params = [:], Closure body) {
   def path = params.containsKey('path') ? params.path : env.WORKSPACE
   def tokenFile = params.containsKey('tokenFile') ? params.tokenFile : '.vault-token'
   getVaultSecret.readSecretWrapper {
-    retry(2) {
-      sleep randomNumber(min: 5, max: 10)
+    retry(3) {
       def token = getVaultSecret.getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID)
       dir(path) {
         writeFile file: tokenFile, text: token
       }
       try {
         body()
       } catch (err) {
-        error "withVaultToken: error ${err}"
+        // When running in the CI with multiple parallel stages
+        // the access could be considered as a DDOS attack. Let's sleep a bit if it fails.
+        sleep randomNumber(min: 2, max: 5)
         throw err
       } finally {
         // ensure any sensitive details are deleted