fix(1961): Retry with new request package

features/support/world.js

@@ -14,9 +14,9 @@ const { ID } = require('./constants');
  * @param  {Function}   retryWithMergedOptions
  * @return {Object}     Build response
  */
-function buildRetryStrategy(response, retryWithMergedOptions) {
+function buildRetryStrategy(response) {
     if (response.body.status === 'QUEUED' || response.body.status === 'RUNNING') {
-        retryWithMergedOptions({});
+        throw new Error('Retry limit reached');
     }
 
     return response;
@@ -196,7 +196,8 @@ function CustomWorld({ attach, parameters }) {
         request({
             url: `${this.instance}/${this.namespace}/builds/${buildID}`,
             method: 'GET',
-            retryOptions: {
+            retry: {
+                statusCodes: [200],
                 limit: 25,
                 calculateDelay: ({ computedValue }) => (computedValue ? 15000 : 0)
             },

features/workflow.feature

@@ -105,7 +105,7 @@ Feature: Workflow
         Then the PR job of "AFTER-SIMPLE" is triggered from PR job of "SIMPLE"
         And that "AFTER-SIMPLE" PR build uses the same SHA as the "SIMPLE" PR build
         And the "AFTER-SIMPLE" PR build succeeded
-    
+
     @ignore
     Scenario: Branch filtering (a pull request is opened to the master branch)
         Given an existing pipeline on "master" branch with the workflow jobs:

plugins/pipelines/caches/request.js

@@ -12,9 +12,9 @@ const RETRY_LIMIT = 3;
  * @param   {Function}  retryWithMergedOptions
  * @return  {Object}    Response
  */
-const retryStrategyFn = (response, retryWithMergedOptions) => {
+const retryStrategyFn = response => {
     if (Math.floor(response.statusCode / 100) !== 2) {
-        retryWithMergedOptions({});
+        throw new Error('Retry limit reached');
     }
 
     return response;
@@ -78,19 +78,19 @@ async function invoke(request) {
     }
 
     if (retryStrategyFn) {
-        const retryOptions = {
+        const retry = {
             limit: RETRY_LIMIT,
             calculateDelay: ({ computedValue }) => (computedValue ? RETRY_DELAY * 1000 : 0) // in ms
         };
 
         if (method === 'POST') {
-            Object.assign(retryOptions, {
+            Object.assign(retry, {
                 methods: ['POST']
             });
         }
 
         Object.assign(options, {
-            retryOptions,
+            retry,
             hooks: {
                 afterResponse: [retryStrategyFn]
             }