Skip to content

Commit c3afbaf

Browse files
committed
Use sourceRegistry from deps.yaml for sorbet/drctl in ctst Dockerfile
The ctst Dockerfile hardcoded ghcr.io/scality as the registry for sorbet and drctl images, ignoring the sourceRegistry field in deps.yaml. This meant changing sourceRegistry (e.g. to a playground fork) had no effect on CI test builds. Extract the full image path (sourceRegistry + image) from deps.yaml using yq in the workflow, and pass it as Docker build args. The Dockerfile now uses SORBET_IMAGE and DRCTL_IMAGE ARGs with backward-compatible defaults. Issue: ZENKO-5220
1 parent 0bdf979 commit c3afbaf

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/end2end.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,10 @@ jobs:
425425
working-directory: solution
426426
run: |-
427427
cat <<EOF >> $GITHUB_ENV
428+
SORBET_IMAGE=$(yq eval '.sorbet | .sourceRegistry + "/" + .image' deps.yaml)
428429
SORBET_TAG=$(yq eval '.sorbet.tag' deps.yaml)
429-
DRCTL_TAG=$(yq eval .drctl.tag deps.yaml)
430+
DRCTL_IMAGE=$(yq eval '.drctl | .sourceRegistry + "/" + .image' deps.yaml)
431+
DRCTL_TAG=$(yq eval '.drctl.tag' deps.yaml)
430432
EOF
431433
- name: Build and push CI image
432434
uses: docker/build-push-action@v5
@@ -437,7 +439,9 @@ jobs:
437439
secrets: |
438440
GIT_AUTH_TOKEN=${{ steps.app-token.outputs.token }}
439441
build-args: |
442+
SORBET_IMAGE=${{ env.SORBET_IMAGE }}
440443
SORBET_TAG=${{ env.SORBET_TAG }}
444+
DRCTL_IMAGE=${{ env.DRCTL_IMAGE }}
441445
DRCTL_TAG=${{ env.DRCTL_TAG }}
442446
tags: "${{ env.E2E_CTST_IMAGE_NAME }}:${{ env.E2E_IMAGE_TAG }}"
443447
cache-from: type=gha,scope=end2end-ctst

tests/ctst/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
ARG SORBET_IMAGE=ghcr.io/scality/sorbet
12
ARG SORBET_TAG=latest
3+
ARG DRCTL_IMAGE=ghcr.io/scality/zenko-drctl
24
ARG DRCTL_TAG=latest
35

4-
FROM ghcr.io/scality/sorbet:$SORBET_TAG AS sorbet
5-
FROM ghcr.io/scality/zenko-drctl:$DRCTL_TAG AS drctl
6+
FROM $SORBET_IMAGE:$SORBET_TAG AS sorbet
7+
FROM $DRCTL_IMAGE:$DRCTL_TAG AS drctl
68

79
FROM node:24.14.0-bookworm-slim
810

0 commit comments

Comments
 (0)