From 9c3253db1f7c0a2924af2a1bda1a3f3459573084 Mon Sep 17 00:00:00 2001 From: Pedro Larroy Date: Fri, 11 Jan 2019 11:50:24 +0100 Subject: [PATCH] [CI] Prevent timeouts when rebuilding containers with docker. (#13818) * Prevent timeouts when rebuilding containers with docker. Increase timeout from 120 to 180 for pipelines * Increase docker cache timeout * Increase timeout also for docs * limit parallel builds to 10 --- ci/docker_cache.py | 5 +++-- ci/jenkins/Jenkinsfile_centos_cpu | 2 +- ci/jenkins/Jenkinsfile_centos_gpu | 2 +- ci/jenkins/Jenkinsfile_clang | 2 +- ci/jenkins/Jenkinsfile_edge | 2 +- ci/jenkins/Jenkinsfile_miscellaneous | 2 +- ci/jenkins/Jenkinsfile_sanity | 2 +- ci/jenkins/Jenkinsfile_unix_cpu | 2 +- ci/jenkins/Jenkinsfile_unix_gpu | 2 +- ci/jenkins/Jenkinsfile_website | 2 +- ci/jenkins/Jenkinsfile_windows_cpu | 2 +- ci/jenkins/Jenkinsfile_windows_gpu | 2 +- docs/Jenkinsfile | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ci/docker_cache.py b/ci/docker_cache.py index db66f722b22e..f906b0eba66c 100755 --- a/ci/docker_cache.py +++ b/ci/docker_cache.py @@ -37,7 +37,8 @@ DOCKERHUB_LOGIN_NUM_RETRIES = 5 DOCKERHUB_RETRY_SECONDS = 5 DOCKER_CACHE_NUM_RETRIES = 3 -DOCKER_CACHE_TIMEOUT_MINS = 5 +DOCKER_CACHE_TIMEOUT_MINS = 15 +PARALLEL_BUILDS = 10 def build_save_containers(platforms, registry, load_cache) -> int: @@ -52,7 +53,7 @@ def build_save_containers(platforms, registry, load_cache) -> int: if len(platforms) == 0: return 0 - platform_results = Parallel(n_jobs=len(platforms), backend="multiprocessing")( + platform_results = Parallel(n_jobs=PARALLEL_BUILDS, backend="multiprocessing")( delayed(_build_save_container)(platform, registry, load_cache) for platform in platforms) diff --git a/ci/jenkins/Jenkinsfile_centos_cpu b/ci/jenkins/Jenkinsfile_centos_cpu index 3b66f8100173..a47ab3de7fb7 100644 --- a/ci/jenkins/Jenkinsfile_centos_cpu +++ b/ci/jenkins/Jenkinsfile_centos_cpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_centos_gpu b/ci/jenkins/Jenkinsfile_centos_gpu index aec3b9054f2f..cad77a9a7dd8 100644 --- a/ci/jenkins/Jenkinsfile_centos_gpu +++ b/ci/jenkins/Jenkinsfile_centos_gpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_clang b/ci/jenkins/Jenkinsfile_clang index 61920cf9865b..029c7208107b 100644 --- a/ci/jenkins/Jenkinsfile_clang +++ b/ci/jenkins/Jenkinsfile_clang @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_edge b/ci/jenkins/Jenkinsfile_edge index c101ba102386..9d8e01399d7c 100644 --- a/ci/jenkins/Jenkinsfile_edge +++ b/ci/jenkins/Jenkinsfile_edge @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_miscellaneous b/ci/jenkins/Jenkinsfile_miscellaneous index c02cc991b864..dbf2a9e41c76 100644 --- a/ci/jenkins/Jenkinsfile_miscellaneous +++ b/ci/jenkins/Jenkinsfile_miscellaneous @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { diff --git a/ci/jenkins/Jenkinsfile_sanity b/ci/jenkins/Jenkinsfile_sanity index 123fedfdab79..ed4d16ec47db 100644 --- a/ci/jenkins/Jenkinsfile_sanity +++ b/ci/jenkins/Jenkinsfile_sanity @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu index 1cbb6a72e3a7..00b1aa9f68d9 100644 --- a/ci/jenkins/Jenkinsfile_unix_cpu +++ b/ci/jenkins/Jenkinsfile_unix_cpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_unix_gpu b/ci/jenkins/Jenkinsfile_unix_gpu index cf92836e96e4..bd884904d596 100644 --- a/ci/jenkins/Jenkinsfile_unix_gpu +++ b/ci/jenkins/Jenkinsfile_unix_gpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_website b/ci/jenkins/Jenkinsfile_website index 050f509e68e9..acdd2be4d00e 100644 --- a/ci/jenkins/Jenkinsfile_website +++ b/ci/jenkins/Jenkinsfile_website @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu index 9e70df38dca5..a8746db73d34 100644 --- a/ci/jenkins/Jenkinsfile_windows_cpu +++ b/ci/jenkins/Jenkinsfile_windows_cpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/ci/jenkins/Jenkinsfile_windows_gpu b/ci/jenkins/Jenkinsfile_windows_gpu index 69fd07343859..2319f25942de 100644 --- a/ci/jenkins/Jenkinsfile_windows_gpu +++ b/ci/jenkins/Jenkinsfile_windows_gpu @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('utility') { // Loading the utilities requires a node context unfortunately diff --git a/docs/Jenkinsfile b/docs/Jenkinsfile index b65bfad4247b..676204291893 100644 --- a/docs/Jenkinsfile +++ b/docs/Jenkinsfile @@ -21,7 +21,7 @@ // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/ // timeout in minutes -max_time = 120 +max_time = 180 node('restricted-utility') { // Loading the utilities requires a node context unfortunately