ci: add jq utility

Needed as a dependency for the yq utility.

Also bump x86-build-base image.

Fixes: f2649b93e29e ("ci: performance traces: make use of no-perf label")

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18595>

diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index a5eff31..02d04e5 100644 (file)
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -58,6 +58,7 @@ apt-get -y install --no-install-recommends \
     ca-certificates \
     firmware-realtek \
     initramfs-tools \
+    jq \
     libasan6 \
     libexpat1 \
     libpng16-16 \

diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index 24dd52e..d40eb5d 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -62,6 +62,7 @@ apt-get install -y --no-remove \
       git-lfs \
       inetutils-syslogd \
       iptables \
+      jq \
       libasan6 \
       libexpat1 \
       libllvm13 \

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 7af473a..ed52bc0 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -3,7 +3,7 @@ variables:
    DEBIAN_BASE_TAG: "2022-09-12-virglrenderer"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-09-11-rusticl"
+   DEBIAN_BUILD_TAG: "2022-09-14-add-jq"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@@ -11,11 +11,11 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-09-13-piglit-uprev-traces"
-   DEBIAN_X86_TEST_VK_TAG: "2022-09-13-piglit-uprev-traces"
+   DEBIAN_X86_TEST_GL_TAG: "2022-09-14-add-jq"
+   DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq"
 
    FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck"
-   KERNEL_ROOTFS_TAG: "2022-09-13-piglit-uprev-traces"
+   KERNEL_ROOTFS_TAG: "2022-09-14-add-jq"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-08-17-bump"