From e26777c01435e71b6cba5d5c4ef2e22565545ea1 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 1 Aug 2019 10:46:00 +0100
Subject: [PATCH] Parameterize and increase CI task timeouts

---
 ci/parameters.yml |  1 +
 ci/pipeline.yml   | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ci/parameters.yml b/ci/parameters.yml
index 7293723ed5..6252bc4cde 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -11,3 +11,4 @@ pipeline-name: "spring-boot-2.0.x"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
 bintray-repo: "jars"
+task-timeout: 2h00m
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 7bb3b74946..2f790d5be4 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -149,20 +149,20 @@ jobs:
   - do:
     - task: build-project
       privileged: true
-      timeout: 1h30m
+      timeout: ((task-timeout))
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/build-project.yml
     - aggregate:
       - task: build-samples
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-samples.yml
       - task: build-integration-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
       - task: build-deployment-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
     on_failure:
@@ -213,20 +213,20 @@ jobs:
         path: git-repo
         status: pending
     - task: build-project
-      timeout: 1h30m
+      timeout: ((task-timeout))
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/build-pr-project.yml
     - aggregate:
       - task: build-samples
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-samples.yml
       - task: build-integration-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
       - task: build-deployment-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
     on_success:
@@ -251,20 +251,20 @@ jobs:
   - do:
     - task: build-project
       privileged: true
-      timeout: 1h30m
+      timeout: ((task-timeout))
       image: spring-boot-jdk9-ci-image
       file: git-repo/ci/tasks/build-project.yml
     - aggregate:
       - task: build-samples
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk9-ci-image
         file: git-repo/ci/tasks/build-samples.yml
       - task: build-integration-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk9-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
       - task: build-deployment-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk9-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
     on_failure:
@@ -297,20 +297,20 @@ jobs:
   - do:
     - task: build-project
       privileged: true
-      timeout: 1h30m
+      timeout: ((task-timeout))
       image: spring-boot-jdk10-ci-image
       file: git-repo/ci/tasks/build-project.yml
     - aggregate:
       - task: build-samples
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk10-ci-image
         file: git-repo/ci/tasks/build-samples.yml
       - task: build-integration-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk10-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
       - task: build-deployment-tests
-        timeout: 1h30m
+        timeout: ((task-timeout))
         image: spring-boot-jdk10-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
     on_failure: