Module: Mesa Branch: main Commit: 298f2db76da0b4e6d9313bb6d85347b6ed4d64b8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=298f2db76da0b4e6d9313bb6d85347b6ed4d64b8
Author: Eric Engestrom <[email protected]> Date: Tue Oct 10 15:16:24 2023 +0100 ci/b2c: move to the shiny new `gfx-ci/ci-tron` repo We've successfully moved the repo to its new location now that the project is ready for general use. Update the config to use the new paths. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25643> --- .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 4 ++-- .gitlab-ci/test/gitlab-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index 1b7c2857cbc..5761c485626 100644 --- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 +++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 @@ -50,8 +50,8 @@ deployment: SALAD.machine_id={{ '{{' }} machine_id }} console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep loglevel={{ log_level }} no_hash_pointers - b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/eric/valve-infra/telegraf-container:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }} - b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/eric/valve-infra/machine_registration:latest check" + b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }} + b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/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 %},remove,expiration=pipeline_end,preserve" diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 139f4125988..6734813ded2 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -278,13 +278,13 @@ clang-format: # like FDO_DISTRIBUTION_TAG for *the* image, there is no way to # depend on more than one image per job. So, the job container is # built as part of the CI in the boot2container project. - image: registry.freedesktop.org/eric/valve-infra/mesa-trigger:2023-03-08.1 + image: registry.freedesktop.org/gfx-ci/ci-tron/mesa-trigger:2023-03-08.1 timeout: 1h 40m variables: # No need by default to pull the whole repo GIT_STRATEGY: none # boot2container initrd configuration parameters. - B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/519/download' # Linux 6.1 + B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download' # Linux 6.1 B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/initramfs.linux_amd64.cpio.xz' B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$' B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout'
