diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2023-11-15 15:47:43 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2023-11-16 14:25:10 +0000 |
| commit | ec0421d0adbb6a81e9638e73c3fbff16515d7b48 (patch) | |
| tree | 22312a5b9f1238c860bc8aae74475c7c79f1cfaf | |
| parent | e29a00d6579f0ec6421829cb5765411c0165af19 (diff) | |
CI: bump vm2c and kernel for VMs
Actually libinput is one of the last users of harbor.fd.o, because it uses
an outdated version of vm2c.py. Use the new location of the project,
bump its release, and also bump the kernel version we test while at it.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 3 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 492ebb1c..42fc09d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -426,8 +426,7 @@ freebsd:13.1@container-clean: - 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_IMAGE: $FDO_DISTRIBUTION_IMAGE B2C_COMMAND: .gitlab-ci/start-in-systemd.sh script: @@ -435,7 +434,7 @@ freebsd:13.1@container-clean: - .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 6cdfb13a..7c33cd2d 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -303,7 +303,6 @@ check-whitespace: variables: MESON_BUILDDIR: build_dir B2C_KERNEL: {{ b2c.kernel }} - B2C_VERSION: {{ b2c.version }} B2C_IMAGE: $FDO_DISTRIBUTION_IMAGE B2C_COMMAND: .gitlab-ci/start-in-systemd.sh script: @@ -311,7 +310,7 @@ check-whitespace: - .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 52ad03fa..6f7bd3f7 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -208,5 +208,5 @@ test_suites: - pointer 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 |