mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	ZTS: Update FreeBSD version numbers
All defined variants:
- freebsd13-4r, freebsd13-5r, freebsd14-1r, freebsd14-2r (RELEASE)
- freebsd13-5s, freebsd14-2s (STABLE)
- freebsd15-0c (CURRENT)
Used for testing:
- freebsd13-4r (RELEASE)
- freebsd14-2s (STABLE)
- freebsd15-0c (CURRENT)
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
Closes: #17260
(cherry picked from commit 6afb405d96)
			
			
This commit is contained in:
		
							parent
							
								
									b590bfc6c8
								
							
						
					
					
						commit
						658526db99
					
				
							
								
								
									
										23
									
								
								.github/workflows/scripts/qemu-2-start.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								.github/workflows/scripts/qemu-2-start.sh
									
									
									
									
										vendored
									
									
								
							| @ -14,7 +14,7 @@ OSv=$OS | |||||||
| 
 | 
 | ||||||
| # compressed with .zst extension | # compressed with .zst extension | ||||||
| REPO="https://github.com/mcmilk/openzfs-freebsd-images" | REPO="https://github.com/mcmilk/openzfs-freebsd-images" | ||||||
| FREEBSD="$REPO/releases/download/v2024-12-14" | FREEBSD="$REPO/releases/download/v2025-04-13" | ||||||
| URLzs="" | URLzs="" | ||||||
| 
 | 
 | ||||||
| # Ubuntu mirrors | # Ubuntu mirrors | ||||||
| @ -37,8 +37,6 @@ case "$OS" in | |||||||
|   archlinux) |   archlinux) | ||||||
|     OSNAME="Archlinux" |     OSNAME="Archlinux" | ||||||
|     URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2" |     URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2" | ||||||
|     # dns sometimes fails with that url  :/ |  | ||||||
|     echo "89.187.191.12  geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null |  | ||||||
|     ;; |     ;; | ||||||
|   centos-stream10) |   centos-stream10) | ||||||
|     OSNAME="CentOS Stream 10" |     OSNAME="CentOS Stream 10" | ||||||
| @ -80,16 +78,29 @@ case "$OS" in | |||||||
|     BASH="/usr/local/bin/bash" |     BASH="/usr/local/bin/bash" | ||||||
|     NIC="rtl8139" |     NIC="rtl8139" | ||||||
|     ;; |     ;; | ||||||
|  |   freebsd13-5r) | ||||||
|  |     OSNAME="FreeBSD 13.5-RELEASE" | ||||||
|  |     OSv="freebsd13.0" | ||||||
|  |     URLzs="$FREEBSD/amd64-freebsd-13.5-RELEASE.qcow2.zst" | ||||||
|  |     BASH="/usr/local/bin/bash" | ||||||
|  |     NIC="rtl8139" | ||||||
|  |     ;; | ||||||
|  |   freebsd14-1r) | ||||||
|  |     OSNAME="FreeBSD 14.1-RELEASE" | ||||||
|  |     OSv="freebsd14.0" | ||||||
|  |     URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst" | ||||||
|  |     BASH="/usr/local/bin/bash" | ||||||
|  |     ;; | ||||||
|   freebsd14-2r) |   freebsd14-2r) | ||||||
|     OSNAME="FreeBSD 14.2-RELEASE" |     OSNAME="FreeBSD 14.2-RELEASE" | ||||||
|     OSv="freebsd14.0" |     OSv="freebsd14.0" | ||||||
|     URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst" |     URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst" | ||||||
|     BASH="/usr/local/bin/bash" |     BASH="/usr/local/bin/bash" | ||||||
|     ;; |     ;; | ||||||
|   freebsd13-4s) |   freebsd13-5s) | ||||||
|     OSNAME="FreeBSD 13.4-STABLE" |     OSNAME="FreeBSD 13.5-STABLE" | ||||||
|     OSv="freebsd13.0" |     OSv="freebsd13.0" | ||||||
|     URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst" |     URLzs="$FREEBSD/amd64-freebsd-13.5-STABLE.qcow2.zst" | ||||||
|     BASH="/usr/local/bin/bash" |     BASH="/usr/local/bin/bash" | ||||||
|     NIC="rtl8139" |     NIC="rtl8139" | ||||||
|     ;; |     ;; | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								.github/workflows/scripts/qemu-3-deps-vm.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/scripts/qemu-3-deps-vm.sh
									
									
									
									
										vendored
									
									
								
							| @ -55,6 +55,7 @@ function freebsd() { | |||||||
|     '^samba4[[:digit:]]+$' \ |     '^samba4[[:digit:]]+$' \ | ||||||
|     '^py3[[:digit:]]+-cffi$' \ |     '^py3[[:digit:]]+-cffi$' \ | ||||||
|     '^py3[[:digit:]]+-sysctl$' \ |     '^py3[[:digit:]]+-sysctl$' \ | ||||||
|  |     '^py3[[:digit:]]+-setuptools$' \ | ||||||
|     '^py3[[:digit:]]+-packaging$' |     '^py3[[:digit:]]+-packaging$' | ||||||
|   echo "##[endgroup]" |   echo "##[endgroup]" | ||||||
| } | } | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.github/workflows/zfs-qemu.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/zfs-qemu.yml
									
									
									
									
										vendored
									
									
								
							| @ -34,7 +34,7 @@ jobs: | |||||||
|       - name: Generate OS config and CI type |       - name: Generate OS config and CI type | ||||||
|         id: os |         id: os | ||||||
|         run: | |         run: | | ||||||
|           FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]' |           FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]' | ||||||
|           QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]' |           QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]' | ||||||
|           # determine CI type when running on PR |           # determine CI type when running on PR | ||||||
|           ci_type="full" |           ci_type="full" | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Tino Reichardt
						Tino Reichardt