summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2024-03-21 15:21:01 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2024-03-21 15:26:57 +1000
commit179fc4d3706e3c8da22d58d8c9661deb437f1672 (patch)
treedead60e7215f88b141cc8f5594187f63daea305a
parent703999edec2aab34c126391f32b186031ddf198b (diff)
gitlab CI: update to the same b2c image libinput uses
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.gitlab-ci/ci.template2
-rw-r--r--.gitlab-ci/config.yml4
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fa58e2..73d04c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -651,8 +651,8 @@ soname:
- kvm
variables:
MESON_BUILDDIR: build_dir
- B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.1/bzImage
- B2C_VERSION: v0.9.9
+ B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.5/bzImage
+ B2C_VERSION: 2ff65156ba67fa8a0c309a4fc16c5df1a88a3844
B2C_IMAGE: $FDO_DISTRIBUTION_IMAGE
B2C_COMMAND: .gitlab-ci/start-in-systemd.sh
script:
@@ -660,7 +660,7 @@ soname:
- .gitlab-ci/meson-build.sh --skip-test
# pull b2c
- - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/v0.9.9/vm2c.py
+ - curl -L -o /app/boot2container https://gitlab.freedesktop.org/gfx-ci/boot2container/-/raw/2ff65156ba67fa8a0c309a4fc16c5df1a88a3844/vm2c.py
- chmod +x /app/boot2container
# runs the test suite only
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index fed6f8a..5917271 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -409,7 +409,7 @@ soname:
- .gitlab-ci/meson-build.sh --skip-test
# pull b2c
- - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/{{b2c.version}}/vm2c.py
+ - curl -L -o /app/boot2container https://gitlab.freedesktop.org/gfx-ci/boot2container/-/raw/{{b2c.version}}/vm2c.py
- chmod +x /app/boot2container
# runs the test suite only
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 9fe15f6..47257bc 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -122,5 +122,5 @@ distributions:
- linux-headers
b2c:
- version: v0.9.9
- kernel: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.1/bzImage
+ version: 2ff65156ba67fa8a0c309a4fc16c5df1a88a3844
+ kernel: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.5/bzImage