ci: Move BASE_TAG expansion to FDO_BASE_IMAGE assignment
This fixes the build of images which use another Mesa image as the base.
v2:
* Move $CI_REGISTRY_IMAGE expansion into FDO_BASE_IMAGE assignment as
well (Dave Airlie)
Fixes: 0781d9825b
"ci: Append $MESA_TEMPLATES_COMMIT to image tags"
Reported-by: Dave Airlie <airlied@redhat.com>
Acked-by: Eric Anholt <eric@anholt.net> # v1
Reviewed-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7957>
This commit is contained in:
parent
5998a6543a
commit
f957d0d915
|
@ -226,7 +226,7 @@ success:
|
||||||
# Otherwise, container jobs won't run
|
# Otherwise, container jobs won't run
|
||||||
- when: never
|
- when: never
|
||||||
variables:
|
variables:
|
||||||
FDO_BASE_IMAGE: "${MESA_BASE_IMAGE}-${MESA_TEMPLATES_COMMIT}"
|
FDO_BASE_IMAGE: "${CI_REGISTRY_IMAGE}/${MESA_BASE_IMAGE}:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}"
|
||||||
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}-${MESA_TEMPLATES_COMMIT}"
|
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}-${MESA_TEMPLATES_COMMIT}"
|
||||||
FDO_DISTRIBUTION_VERSION: buster-slim
|
FDO_DISTRIBUTION_VERSION: buster-slim
|
||||||
FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
|
FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
|
||||||
|
@ -248,8 +248,8 @@ x86_build-base:
|
||||||
- .ci-run-policy
|
- .ci-run-policy
|
||||||
stage: container-2
|
stage: container-2
|
||||||
variables:
|
variables:
|
||||||
BASE_TAG: *x86_build-base
|
MESA_BASE_IMAGE: "debian/x86_build-base"
|
||||||
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${BASE_TAG}"
|
MESA_BASE_TAG: *x86_build-base
|
||||||
needs:
|
needs:
|
||||||
- x86_build-base
|
- x86_build-base
|
||||||
|
|
||||||
|
@ -335,8 +335,8 @@ x86_test-base:
|
||||||
- .ci-run-policy
|
- .ci-run-policy
|
||||||
stage: container-2
|
stage: container-2
|
||||||
variables:
|
variables:
|
||||||
BASE_TAG: *x86_test-base
|
MESA_BASE_IMAGE: "debian/x86_test-base"
|
||||||
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_test-base:${BASE_TAG}"
|
MESA_BASE_TAG: *x86_test-base
|
||||||
needs:
|
needs:
|
||||||
- x86_test-base
|
- x86_test-base
|
||||||
|
|
||||||
|
@ -381,8 +381,8 @@ arm_test-base:
|
||||||
- .ci-run-policy
|
- .ci-run-policy
|
||||||
stage: container-2
|
stage: container-2
|
||||||
variables:
|
variables:
|
||||||
BASE_TAG: *arm_test-base
|
MESA_BASE_IMAGE: "debian/arm_test-base"
|
||||||
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/arm_test-base:${BASE_TAG}"
|
MESA_BASE_TAG: *arm_test-base
|
||||||
needs:
|
needs:
|
||||||
- arm_test-base
|
- arm_test-base
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ kernel+rootfs_amd64:
|
||||||
extends:
|
extends:
|
||||||
- .use-x86_build-base
|
- .use-x86_build-base
|
||||||
- .kernel+rootfs
|
- .kernel+rootfs
|
||||||
image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${BASE_TAG}-${MESA_TEMPLATES_COMMIT}"
|
image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}"
|
||||||
variables:
|
variables:
|
||||||
DEBIAN_ARCH: "amd64"
|
DEBIAN_ARCH: "amd64"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue