From e373d70bb1e954a5f54aa979cd0bd5d54bfbc2ea Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 29 Aug 2024 13:22:03 +0000
Subject: [PATCH] fix: limit --no-cache retries to 1
---
.gitlab-ci.yml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53767473a..cc45693d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,6 +269,7 @@ base:
needs:
- version
script:
+ - attempts=0
- while !
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
@@ -289,7 +290,12 @@ base:
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
- fi
+ fi ;
+ if test ${attempts} -ge 1 ; then
+ echo "Failed to build on second attempt!" ;
+ exit 1 ;
+ fi ;
+ let attempts=$attempts+1 ;
done
@@ -353,6 +359,7 @@ eic:
source eic-spack.sh ;
export SPACK_VERSION ;
cat mirrors.yaml.in | envsubst > mirrors.yaml
+ - attempts=0
- while !
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
@@ -441,10 +448,15 @@ eic:
2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
- BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
+ BUILD_OPTIONS="--no-cache-filter spack,builder,staging,runtime ${BUILD_OPTIONS}" ;
else
exit 1 ;
- fi
+ fi ;
+ if test ${attempts} -ge 1 ; then
+ echo "Failed to build on second attempt!" ;
+ exit 1 ;
+ fi ;
+ let attempts=$attempts+1 ;
done
.singularity:
--
GitLab