diff options
| author | Thomas Huth <thuth@redhat.com> | 2024-09-10 15:05:09 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-09-11 11:26:41 +0200 |
| commit | b4358ed4fd29c21c69e492d814f0926c58caa10f (patch) | |
| tree | fdea556fe086bb5c90ed02bc5e3d922569a5a1ca | |
| parent | 05e303210dc83a008c8c06fe82b632aa2e87c49b (diff) | |
| download | qemu-b4358ed4fd29c21c69e492d814f0926c58caa10f.zip qemu-b4358ed4fd29c21c69e492d814f0926c58caa10f.tar.gz qemu-b4358ed4fd29c21c69e492d814f0926c58caa10f.tar.bz2 | |
Update FreeBSD CI jobs FreeBSD 14.1
The current FreeBSD CI jobs are failing installation since the
"opencv" package is now missing there. Updating to 14.1 fixes
the issue.
Message-Id: <20240911090149.286257-1-thuth@redhat.com>
Reviewed-by: Li-Wen Hsu <lwhsu@FreeBSD.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/cirrus.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci.d/cirrus/freebsd-14.vars (renamed from .gitlab-ci.d/cirrus/freebsd-13.vars) | 2 | ||||
| -rwxr-xr-x | tests/lcitool/refresh | 4 | ||||
| -rwxr-xr-x | tests/vm/freebsd | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 75df127..92c97ee 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -46,13 +46,13 @@ variables: QEMU_JOB_CIRRUS: 1 -x64-freebsd-13-build: +x64-freebsd-14-build: extends: .cirrus_build_job variables: - NAME: freebsd-13 + NAME: freebsd-14 CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-13-3 + CIRRUS_VM_IMAGE_NAME: freebsd-14-1 CIRRUS_VM_CPUS: 8 CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update; pkg upgrade -y diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-14.vars index 69c948b..aba0eff 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-14.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables freebsd-13 qemu +# $ lcitool variables freebsd-14 qemu # # https://gitlab.com/libvirt/libvirt-ci diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ac803e3..290804f 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -207,14 +207,14 @@ try: # # Cirrus packages lists for GitLab # - generate_cirrus("freebsd-13") + generate_cirrus("freebsd-14") generate_cirrus("macos-13") generate_cirrus("macos-14") # # VM packages lists # - generate_pkglist("freebsd", "freebsd-13") + generate_pkglist("freebsd", "freebsd-14") # # Ansible package lists diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 1247f40..74b3b1e 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): name = "freebsd" arch = "x86_64" - link = "https://download.freebsd.org/releases/CI-IMAGES/13.2-RELEASE/amd64/Latest/FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw.xz" - csum = "a4fb3b6c7b75dd4d58fb0d75e4caf72844bffe0ca00e66459c028b198ffb3c0e" + link = "https://download.freebsd.org/releases/CI-IMAGES/14.1-RELEASE/amd64/Latest/FreeBSD-14.1-RELEASE-amd64-BASIC-CI.raw.xz" + csum = "202fe27a05427f0a86d3ebb97712745186f2776ccc4f70d95466dd99a0238ba5" size = "20G" BUILD_SCRIPT = """ @@ -39,7 +39,7 @@ class FreeBSDVM(basevm.BaseVM): mkdir src build; cd src; tar -xf /dev/vtbd1; cd ../build; - ../src/configure --python=python3.9 --extra-ldflags=-L/usr/local/lib \ + ../src/configure --extra-ldflags=-L/usr/local/lib \ --extra-cflags=-I/usr/local/include {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ |