diff options
| author | Martin Roukala (né Peres) <martin.roukala@mupuf.org> | 2023-10-06 21:20:11 +0300 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-10-07 04:42:03 +0000 |
| commit | 0c10cbff558b5070b90642db7fcf672191f348f4 (patch) | |
| tree | 4a5f7cf43eaa2e217e777ddec7e33e1800e333b2 /.gitlab-ci | |
| parent | 1929c0d954579f1045d0ae3e9b032d1bdad8bb48 (diff) | |
| download | mesa-0c10cbff558b5070b90642db7fcf672191f348f4.tar.gz mesa-0c10cbff558b5070b90642db7fcf672191f348f4.tar.bz2 mesa-0c10cbff558b5070b90642db7fcf672191f348f4.zip | |
ci/b2c: switch containers to a back-up ahead of valve-infra renaming
We are about to rename mupuf/valve-infra into gfx-ci/ci-tron.
While most resources will transparently be redirected, gitlab does
not allow us to keep our containers during the migration.
To work around that, I uploaded the current containers to Eric's fork
of valve-infra. Let's use these containers until the migration is over!
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25593>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/b2c/b2c.yml.jinja2.jinja2 | 4 | ||||
| -rw-r--r-- | .gitlab-ci/test/gitlab-ci.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 index 6a63ad31e45..1b7c2857cbc 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 }}/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.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.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 50cd20c227b..62c376ae5b5 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -278,7 +278,7 @@ 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/mupuf/valve-infra/mesa-trigger:2023-03-08.1 + image: registry.freedesktop.org/eric/valve-infra/mesa-trigger:2023-03-08.1 timeout: 1h 40m variables: # No need by default to pull the whole repo |