ci/b2c: fix the generation of the IMAGE_UNDER_TEST variable
The `IMAGE_UNDER_TEST` variable set in `.b2c-test` got broken with the merge of7d474c1
(ci: Move most stuff out of root .gitlab-ci.yml). During the shuffling, the `MESA_BASE_TAG` and `MESA_IMAGE_TAG` variables were dropped, leading to `IMAGE_UNDER_TEST` being an unexisting container. To make this issue less likely to happen in the future, this patch drops the code duplication that led to `IMAGE_UNDER_TEST` to be the same as `MESA_IMAGE` and instead re-uses .use-debian/x86_test-vk to generate `MESA_IMAGE`, which we then use verbatim in `IMAGE_UNDER_TEST`. The renaming is `MESA_IMAGE` into `IMAGE_UNDER_TEST` there to make the distinction clear between the image run by gitlab-runner (what is usually called `MESA_IMAGE` but we instead hardcode to valve-infra's trigger container), and the image we are running on the test machines. Fixes:7d474c1
(ci: Move most stuff out of root .gitlab-ci.yml) Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org> Reviewed-by: Charlie Turner <cturner@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15555>
This commit is contained in:
parent
ea7cda93f3
commit
c672464844
|
@ -181,11 +181,7 @@
|
|||
# built as part of the CI in the boot2container project.
|
||||
image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
|
||||
extends:
|
||||
# Only pull in what is needed to build up the MESA_IMAGE (which is
|
||||
# called for clarity IMAGE_UNDER_TEST). This is in distinction to
|
||||
# the image within which the job runs on the runner machines. The
|
||||
# IMAGE_UNDER_TEST is deployed to the DUTs.
|
||||
- .incorporate-base-tag+templates-commit
|
||||
- .use-debian/x86_test-vk
|
||||
variables:
|
||||
# No need by default to pull the whole repo
|
||||
GIT_STRATEGY: none
|
||||
|
@ -206,8 +202,11 @@
|
|||
B2C_TIMEOUT_OVERALL_MINUTES: 240
|
||||
B2C_TIMEOUT_RETRIES: 0
|
||||
|
||||
MESA_IMAGE_PATH: "debian/x86_test-vk"
|
||||
IMAGE_UNDER_TEST: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
|
||||
# As noted in the top description, we make a distinction between the
|
||||
# container used by gitlab-runner to queue the work, and the container
|
||||
# used by the DUTs/test machines. To make this distinction quite clear,
|
||||
# we rename the MESA_IMAGE variable into IMAGE_UNDER_TEST.
|
||||
IMAGE_UNDER_TEST: "$MESA_IMAGE"
|
||||
|
||||
INSTALL_TARBALL: "./artifacts/install.tar"
|
||||
CI_VALVE_ARTIFACTS: "./artifacts/valve"
|
||||
|
|
Loading…
Reference in New Issue