Skip to content

Commit 6be23f4

Browse files
committed
fix: make sure build container in intermediate stage exists.
1 parent 3096a7a commit 6be23f4

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

.gitlab/build/force_build_core_image.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ build-core:
1414
GIT_STRATEGY: clone
1515
DOCKER_FILE_PATH: "core/docker/Dockerfile"
1616
DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
17-
BUILD_INTERMEDIATE: "FALSE"
17+
BUILD_INTERMEDIATE: "TRUE"
18+
INTERMEDIATE_TARGET: "core-build" # Name of the layer in the dockerfile
19+
INTERMEDIATE_LAYER_NAME: "build"
1820
tags:
1921
- ci-datafed-core
2022
- docker

.gitlab/build/retag_core_image.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ retag-image:
1313
COMPONENT: "core"
1414
GIT_STRATEGY: clone
1515
DATAFED_HARBOR_REGISTRY: "$REGISTRY" # needed by c_harbor_artifact_count
16-
BUILD_INTERMEDIATE: "FALSE"
16+
BUILD_INTERMEDIATE: "TRUE"
17+
INTERMEDIATE_TARGET: "core-build" # Name of the layer in the dockerfile
18+
INTERMEDIATE_LAYER_NAME: "build"
1719
tags:
1820
- docker

.gitlab/stage_unit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ run-authz-unit-job:
128128
- chmod +x run_globus.sh
129129
- ./run_globus.sh
130130

131-
132131
run-core-unit-job:
133132
needs: ["run-core-build-job"]
134133
stage: unit

0 commit comments

Comments
 (0)