mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	ZTS: Add Fedora 41, remove Fedora 39
Fedora 41 was released 10/29/24, and Fedora 39 will be EOL on 11/12/24. Update Fedora runners in the test suite. Some minor tweaks also needed to support ksh 1.0.10. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: George Melikov <mail@gmelikov.ru> Signed-off-by: Tony Hutter <hutter2@llnl.gov> Closes #16700
This commit is contained in:
		
							parent
							
								
									7546fbd6e9
								
							
						
					
					
						commit
						d367ef2995
					
				
							
								
								
									
										12
									
								
								.github/workflows/scripts/qemu-2-start.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/scripts/qemu-2-start.sh
									
									
									
									
										vendored
									
									
								
							| @ -52,16 +52,16 @@ case "$OS" in | ||||
|     OSNAME="Debian 12" | ||||
|     URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2" | ||||
|     ;; | ||||
|   fedora39) | ||||
|     OSNAME="Fedora 39" | ||||
|     OSv="fedora39" | ||||
|     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images/Fedora-Cloud-Base-39-1.5.x86_64.qcow2" | ||||
|     ;; | ||||
|   fedora40) | ||||
|     OSNAME="Fedora 40" | ||||
|     OSv="fedora39" | ||||
|     OSv="fedora-unknown" | ||||
|     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2" | ||||
|     ;; | ||||
|   fedora41) | ||||
|     OSNAME="Fedora 41" | ||||
|     OSv="fedora-unknown" | ||||
|     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2" | ||||
|     ;; | ||||
|   freebsd13-3r) | ||||
|     OSNAME="FreeBSD 13.3-RELEASE" | ||||
|     OSv="freebsd13.0" | ||||
|  | ||||
							
								
								
									
										8
									
								
								.github/workflows/scripts/qemu-3-deps.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/scripts/qemu-3-deps.sh
									
									
									
									
										vendored
									
									
								
							| @ -66,7 +66,13 @@ function rhel() { | ||||
|   echo "##[endgroup]" | ||||
| 
 | ||||
|   echo "##[group]Install Development Tools" | ||||
|   sudo dnf group install -y "Development Tools" | ||||
| 
 | ||||
|   # Alma wants "Development Tools", Fedora 41 wants "development-tools" | ||||
|   if ! sudo dnf group install -y "Development Tools" ; then | ||||
|     echo "Trying 'development-tools' instead of 'Development Tools'" | ||||
|     sudo dnf group install -y development-tools | ||||
|   fi | ||||
| 
 | ||||
|   sudo dnf install -y \ | ||||
|     acl attr bc bzip2 cryptsetup curl dbench dkms elfutils-libelf-devel fio \ | ||||
|     gdb git jq kernel-rpm-macros ksh libacl-devel libaio-devel \ | ||||
|  | ||||
							
								
								
									
										2
									
								
								.github/workflows/scripts/qemu-4-build.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/scripts/qemu-4-build.sh
									
									
									
									
										vendored
									
									
								
							| @ -83,7 +83,7 @@ function rpm_build_and_install() { | ||||
|   echo "##[endgroup]" | ||||
| 
 | ||||
|   echo "##[group]Install" | ||||
|   run sudo dnf -y --skip-broken localinstall $(ls *.rpm | grep -v src.rpm) | ||||
|   run sudo dnf -y --nobest install $(ls *.rpm | grep -v src.rpm) | ||||
|   echo "##[endgroup]" | ||||
| 
 | ||||
| } | ||||
|  | ||||
							
								
								
									
										6
									
								
								.github/workflows/zfs-qemu.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/zfs-qemu.yml
									
									
									
									
										vendored
									
									
								
							| @ -22,8 +22,8 @@ jobs: | ||||
|       - name: Generate OS config and CI type | ||||
|         id: os | ||||
|         run: | | ||||
|           FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora39", "fedora40", "freebsd13-4r", "freebsd14-0r", "freebsd14-1s", "ubuntu20", "ubuntu22", "ubuntu24"]' | ||||
|           QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora40", "freebsd13-3r", "freebsd14-1r", "ubuntu24"]' | ||||
|           FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-4r", "freebsd14-0r", "freebsd14-1s", "ubuntu20", "ubuntu22", "ubuntu24"]' | ||||
|           QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-1r", "ubuntu24"]' | ||||
|           # determine CI type when running on PR | ||||
|           ci_type="full" | ||||
|           if ${{ github.event_name == 'pull_request' }}; then | ||||
| @ -46,7 +46,7 @@ jobs: | ||||
|     strategy: | ||||
|       fail-fast: false | ||||
|       matrix: | ||||
|         # rhl:     almalinux8, almalinux9, centos-stream9, fedora39, fedora40 | ||||
|         # rhl:     almalinux8, almalinux9, centos-stream9, fedora40, fedora41 | ||||
|         # debian:  debian11, debian12, ubuntu20, ubuntu22, ubuntu24 | ||||
|         # misc:    archlinux, tumbleweed | ||||
|         # FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-0r, freebsd14-1r | ||||
|  | ||||
| @ -148,9 +148,9 @@ done | ||||
| 
 | ||||
| # Foreach test create pool, add -n devices and check output. | ||||
| for (( i=0; i < ${#tests[@]}; i+=1 )); do | ||||
| 	typeset tree="${tests[$i].tree}" | ||||
| 	typeset add="${tests[$i].add}" | ||||
| 	typeset want="${tests[$i].want}" | ||||
| 	tree="${tests[$i].tree}" | ||||
| 	add="${tests[$i].add}" | ||||
| 	want="${tests[$i].want}" | ||||
| 
 | ||||
| 	log_must eval zpool create "$TESTPOOL" $tree | ||||
| 	log_must poolexists "$TESTPOOL" | ||||
|  | ||||
| @ -124,8 +124,8 @@ done | ||||
| 
 | ||||
| # Foreach test create pool, add -n devices and check output. | ||||
| for (( i=0; i < ${#tests[@]}; i+=1 )); do | ||||
| 	typeset tree="${tests[$i].tree}" | ||||
| 	typeset want="${tests[$i].want}" | ||||
| 	tree="${tests[$i].tree}" | ||||
| 	want="${tests[$i].want}" | ||||
| 
 | ||||
| 	typeset out="$(log_must eval "zpool create -n '$TESTPOOL' $tree" | \ | ||||
| 	    sed /^SUCCESS/d)" | ||||
|  | ||||
| @ -133,9 +133,9 @@ done | ||||
| 
 | ||||
| # Foreach test create pool, add -n devices and check output. | ||||
| for (( i=0; i < ${#tests[@]}; i+=1 )); do | ||||
| 	typeset tree="${tests[$i].tree}" | ||||
| 	typeset devs="${tests[$i].devs}" | ||||
| 	typeset want="${tests[$i].want}" | ||||
| 	tree="${tests[$i].tree}" | ||||
| 	devs="${tests[$i].devs}" | ||||
| 	want="${tests[$i].want}" | ||||
| 
 | ||||
| 	log_must eval zpool create "$TESTPOOL" $tree | ||||
| 	log_must poolexists "$TESTPOOL" | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Tony Hutter
						Tony Hutter