Mesa (staging/22.1): ci/b2c: fix the generation of the IMAGE_UNDER_TEST variable

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: af570d37a7ba9213894d1264bfcfb42936965566
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af570d37a7ba9213894d1264bfcfb42936965566

Author: Martin Roukala (né Peres) <martin.roukala at mupuf.org>
Date:   Tue Apr 19 10:08:13 2022 +0300

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 of 7d474c1 (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 at mupuf.org>
Reviewed-by: Charlie Turner <cturner at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15555>
(cherry picked from commit c672464844eb47d6cebd6f35d28bcc66c6bd90df)

---

 .gitlab-ci/test/gitlab-ci.yml | 13 ++++++-------
 .pick_status.json             |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 585e4474c17..888d7386316 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -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"
diff --git a/.pick_status.json b/.pick_status.json
index 3f3df50bf8c..c60a6255933 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
         "description": "ci/b2c: fix the generation of the IMAGE_UNDER_TEST variable",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "7d474c100e159393dce471f64b08e8f3b3411b9d"
     },