From befe3a9e48b4bfd1f76193589aec23a86a2097f2 Mon Sep 17 00:00:00 2001 From: Charlie Turner Date: Thu, 17 Feb 2022 09:49:32 +0000 Subject: [PATCH] ci, valve: Add support scripts for the Valve bare-metal farm. - Add the scripts to the prepared Mesa artifacts for use in later runner stages. - Add a template generator (generate_b2c.py) which reads and validates (very lightly for now) the Gitlab job environment and then spits out a YAML file describing the necessary test workload to be sent to a Valve CI gateway. Acked-by: Samuel Pitoiset Reviewed-by: Martin Roukala Part-of: --- .gitlab-ci/prepare-artifacts.sh | 1 + .gitlab-ci/valve/b2c.yml.jinja2.jinja2 | 63 +++++++++++++++ .gitlab-ci/valve/generate_b2c.py | 101 +++++++++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 .gitlab-ci/valve/b2c.yml.jinja2.jinja2 create mode 100755 .gitlab-ci/valve/generate_b2c.py diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index d4fe4029b79..bb96de36a19 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -47,6 +47,7 @@ mkdir -p artifacts/ tar -cf artifacts/install.tar install cp -Rp .gitlab-ci/common artifacts/ci-common cp -Rp .gitlab-ci/lava artifacts/ +cp -Rp .gitlab-ci/valve artifacts/ if [ -n "$MINIO_ARTIFACT_NAME" ]; then # Pass needed files to the test stage diff --git a/.gitlab-ci/valve/b2c.yml.jinja2.jinja2 b/.gitlab-ci/valve/b2c.yml.jinja2.jinja2 new file mode 100644 index 00000000000..b307998f9a5 --- /dev/null +++ b/.gitlab-ci/valve/b2c.yml.jinja2.jinja2 @@ -0,0 +1,63 @@ +version: 1 + +# Rules to match for a machine to qualify +target: +{% if tags %} +{% set b2ctags = tags.split(',') %} + tags: +{% for tag in b2ctags %} + - '{{ tag | trim }}' +{% endfor %} +{% endif %} + +timeouts: + first_console_activity: # This limits the time it can take to receive the first console log + minutes: {{ timeout_first_minutes }} + retries: {{ timeout_first_retries }} + console_activity: # Reset every time we receive a message from the logs + minutes: {{ timeout_minutes }} + retries: {{ timeout_retries }} + boot_cycle: + minutes: {{ timeout_boot_minutes }} + retries: {{ timeout_boot_retries }} + overall: # Maximum time the job can take, not overrideable by the "continue" deployment + minutes: {{ timeout_overall_minutes }} + retries: 0 + # no retries possible here + +console_patterns: + session_end: + regex: >- + {{ session_end_regex }} + session_reboot: + regex: >- + {{ session_reboot_regex }} + job_success: + regex: >- + {{ job_success_regex }} + +# Environment to deploy +deployment: + # Initial boot + start: + kernel: + url: '{{ kernel_url }}' + cmdline: > + SALAD.machine_id={{ '{{' }} machine_id }} + console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep + loglevel={{ log_level }} amdgpu.gpu_recovery=0 + 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 }}" + b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},expiration=pipeline_end,preserve" +{% for volume in volumes %} + b2c.volume={{ volume }} +{% endfor %} + b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}" + {% if cmdline_extras is defined %} + {{ cmdline_extras }} + {% endif %} + + initramfs: + url: '{{ initramfs_url }}' + diff --git a/.gitlab-ci/valve/generate_b2c.py b/.gitlab-ci/valve/generate_b2c.py new file mode 100755 index 00000000000..a68b34a14bc --- /dev/null +++ b/.gitlab-ci/valve/generate_b2c.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 + +# Copyright © 2022 Valve Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +from jinja2 import Environment, FileSystemLoader +from argparse import ArgumentParser +from os import environ, path + + +parser = ArgumentParser() +parser.add_argument('--ci-job-id') +parser.add_argument('--container-cmd') +parser.add_argument('--initramfs-url') +parser.add_argument('--job-success-regex') +parser.add_argument('--job-warn-regex') +parser.add_argument('--kernel-url') +parser.add_argument('--log-level', type=int) +parser.add_argument('--poweroff-delay', type=int) +parser.add_argument('--session-end-regex') +parser.add_argument('--session-reboot-regex') +parser.add_argument('--tags', nargs='?', default='') +parser.add_argument('--template', default='b2c.yml.jinja2.jinja2') +parser.add_argument('--timeout-boot-minutes', type=int) +parser.add_argument('--timeout-boot-retries', type=int) +parser.add_argument('--timeout-first-minutes', type=int) +parser.add_argument('--timeout-first-retries', type=int) +parser.add_argument('--timeout-minutes', type=int) +parser.add_argument('--timeout-overall-minutes', type=int) +parser.add_argument('--timeout-retries', type=int) +parser.add_argument('--job-volume-exclusions', nargs='?', default='') +parser.add_argument('--volume', action='append') +parser.add_argument('--mount-volume', action='append') +parser.add_argument('--local-container', default=environ.get('B2C_LOCAL_CONTAINER', 'alpine:latest')) +parser.add_argument('--working-dir') +args = parser.parse_args() + +env = Environment(loader=FileSystemLoader(path.dirname(args.template)), + trim_blocks=True, lstrip_blocks=True) + +template = env.get_template(path.basename(args.template)) + +values = {} +values['ci_job_id'] = args.ci_job_id +values['container_cmd'] = args.container_cmd +values['initramfs_url'] = args.initramfs_url +values['job_success_regex'] = args.job_success_regex +values['job_warn_regex'] = args.job_warn_regex +values['kernel_url'] = args.kernel_url +values['log_level'] = args.log_level +values['poweroff_delay'] = args.poweroff_delay +values['session_end_regex'] = args.session_end_regex +values['session_reboot_regex'] = args.session_reboot_regex +values['tags'] = args.tags +values['template'] = args.template +values['timeout_boot_minutes'] = args.timeout_boot_minutes +values['timeout_boot_retries'] = args.timeout_boot_retries +values['timeout_first_minutes'] = args.timeout_first_minutes +values['timeout_first_retries'] = args.timeout_first_retries +values['timeout_minutes'] = args.timeout_minutes +values['timeout_overall_minutes'] = args.timeout_overall_minutes +values['timeout_retries'] = args.timeout_retries +if len(args.job_volume_exclusions) > 0: + exclusions = args.job_volume_exclusions.split(",") + values['job_volume_exclusions'] = [excl for excl in exclusions if len(excl) > 0] +if args.volume is not None: + values['volumes'] = args.volume +if args.mount_volume is not None: + values['mount_volumes'] = args.mount_volume +values['working_dir'] = args.working_dir + +assert(len(args.local_container) > 0) +values['local_container'] = args.local_container.replace( + # Use the gateway's pull-through registry cache to reduce load on fd.o. + 'registry.freedesktop.org', '{{ fdo_proxy_registry }}' +) + +if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ: + values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS'] + +f = open(path.splitext(path.basename(args.template))[0], "w") +f.write(template.render(values)) +f.close()