diff options
| author | Sergi Blanch Torne <sergi.blanch.torne@collabora.com> | 2022-11-17 12:37:21 +0100 |
|---|---|---|
| committer | Sergi Blanch Torne <sergi.blanch.torne@collabora.com> | 2022-11-22 08:49:13 +0100 |
| commit | 8b340e27502fcbc1f232342275f2558cec5ee204 (patch) | |
| tree | 826feb089db584a47e4f1c19a1203f26a601ab6b | |
| parent | 0c9eab81adfc77044c372fc2087481be41d75389 (diff) | |
| download | virglrenderer-8b340e27502fcbc1f232342275f2558cec5ee204.tar.gz | |
ci: Uprev mesa and fix the debian/x86_test-{gl,vk} references
Mesa has been updated because of confusion in some variables to define the
test images when one likes to use GL or VK. Because of that, the uprev is
necessary together with a change in naming those variables. So, the jobs
extending from ".use-{gl,vk}-test-image" will now be sure they are using the
correct image.
Signed-off-by: Sergi Blanch Torne <sergi.blanch.torne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/987>
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b49561d3..3f9f7351 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: # # Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/ # - MESA_PIPELINE_ID: 740110 + MESA_PIPELINE_ID: 743439 MESA_PROJECT_PATH: mesa/mesa MINIO_HOST: minio-packet.freedesktop.org CI_REGISTRY_IMAGE: "registry.freedesktop.org/${MESA_PROJECT_PATH}" @@ -37,7 +37,7 @@ include: # IMPORTANT: Use a recent Mesa Git revision # The commit ref must be in sync with the pipeline picked above # It can be found on the pipeline page below the commit message - ref: fda262fe64ed3d55527921e67681056b0efe9f30 + ref: 1ec172646cd7f5b8c04173a6b45a871aa48aa12e file: - '/.gitlab-ci/image-tags.yml' @@ -154,7 +154,7 @@ make check venus: - export CI_JOB_NAME_SANITIZED="$(echo $CI_JOB_NAME | tr ' /' '--')" variables: CI_JOB_JWT_FILE: /minio_jwt - MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH} + MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH} MESA_IMAGE_TAG: ${DEBIAN_X86_TEST_GL_TAG} script: - export DEQP_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}" @@ -185,7 +185,7 @@ make check venus: - export CI_JOB_NAME_SANITIZED="$(echo $CI_JOB_NAME | tr ' /' '--')" variables: CI_JOB_JWT_FILE: /minio_jwt - MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH} + MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_VK_PATH} MESA_IMAGE_TAG: ${DEBIAN_X86_TEST_VK_TAG} script: - export DEQP_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}" |