Mesa (main): ci/b2c: update b2c to enable monitoring support

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 669a3f399121c26429c40cb1a5827911373b5bc2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=669a3f399121c26429c40cb1a5827911373b5bc2

Author: Martin Roukala (né Peres) <martin.roukala at mupuf.org>
Date:   Thu Apr 14 15:34:21 2022 +0300

ci/b2c: update b2c to enable monitoring support

By enabling monitoring, we can collect all kind of metrics such as
CPU/Memory/Disk usage during execution, allowing us to detect
bottlenecks.

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>

---

 .gitlab-ci/test/gitlab-ci.yml          | 2 +-
 .gitlab-ci/valve/b2c.yml.jinja2.jinja2 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 1af617acda4..c4811968e3b 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -187,7 +187,7 @@
     GIT_STRATEGY: none
     # boot2container initrd configuration parameters.
     B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/144/download'  # 5.17.1
-    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.4/downloads/initramfs.linux_amd64.cpio.xz'
+    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.6/downloads/initramfs.linux_amd64.cpio.xz'
     B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$'
     B2C_JOB_WARN_REGEX: 'null'
     B2C_LOG_LEVEL: 6
diff --git a/.gitlab-ci/valve/b2c.yml.jinja2.jinja2 b/.gitlab-ci/valve/b2c.yml.jinja2.jinja2
index 238fb6e883e..2f3e54dd57d 100644
--- a/.gitlab-ci/valve/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/valve/b2c.yml.jinja2.jinja2
@@ -46,6 +46,7 @@ deployment:
         SALAD.machine_id={{ '{{' }} machine_id }}
         console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep
         loglevel={{ log_level }} amdgpu.gpu_recovery=0 no_hash_pointers
+        b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/telegraf-container:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
         b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/machine_registration:latest check"
         b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
         b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"