Skip to content
Snippets Groups Projects
Commit abca33ea authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: add --no-cache on failure in dev and xl

parent cae411b6
Branches
No related tags found
No related merge requests found
This commit is part of merge request !906. Comments created here will be created in the context of that merge request.
...@@ -320,7 +320,8 @@ jug_dev: ...@@ -320,7 +320,8 @@ jug_dev:
source eic-spack.sh ; source eic-spack.sh ;
export SPACK_VERSION ; export SPACK_VERSION ;
cat mirrors.yaml.in | envsubst > mirrors.yaml cat mirrors.yaml.in | envsubst > mirrors.yaml
- docker buildx build --push ${BUILD_OPTIONS} - while !
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE} --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
${EXPORT_TAG:+ ${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}} ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
...@@ -386,7 +387,13 @@ jug_dev: ...@@ -386,7 +387,13 @@ jug_dev:
--provenance false --provenance false
containers/jug containers/jug
2>&1 | tee build.log 2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
fi
done
jug_xl:default: jug_xl:default:
parallel: parallel:
...@@ -413,7 +420,8 @@ jug_xl:default: ...@@ -413,7 +420,8 @@ jug_xl:default:
- dev - dev
script: script:
- apk add git - apk add git
- docker buildx build --push ${BUILD_OPTIONS} - while !
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}-default --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}-default
${EXPORT_TAG:+ ${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}} ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
...@@ -434,7 +442,13 @@ jug_xl:default: ...@@ -434,7 +442,13 @@ jug_xl:default:
--provenance false --provenance false
containers/jug containers/jug
2>&1 | tee build.log 2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
fi
done
jug_xl:nightly: jug_xl:nightly:
parallel: parallel:
...@@ -472,7 +486,8 @@ jug_xl:nightly: ...@@ -472,7 +486,8 @@ jug_xl:nightly:
PUSH_NIGHTLY_WITH_DATE="1" PUSH_NIGHTLY_WITH_DATE="1"
fi fi
- apk add git - apk add git
- docker buildx build --push ${BUILD_OPTIONS} - while !
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}-nightly --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}-nightly
${EXPORT_TAG:+ ${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}-nightly} ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}-nightly}
...@@ -512,7 +527,13 @@ jug_xl:nightly: ...@@ -512,7 +527,13 @@ jug_xl:nightly:
--provenance false --provenance false
containers/jug containers/jug
2>&1 | tee build.log 2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
fi
done
.singularity: .singularity:
image: image:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment