2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-11-20 17:32:15 +00:00

Merge fix/selinux-cn-ipxe-bootcfg into releases/2.20.0-rc9

selinux_cn_diskless_disabled_by_design named three boot-configuration paths and
none of them is the iPXE node script, so the case failed on every cell whose
compute node is netboot=ipxe.
This commit is contained in:
Daniel Hilst
2026-11-07 20:15:40 -03:00
+2 -2
View File
@@ -61,7 +61,7 @@ cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-net
check:rc==0
check:output=~SELinux is disabled
check:output=~cannot label its RAM root
cmd:sh -c 'ok=0; seen=0; for f in /tftpboot/xcat/xnba/nodes/$$CN /tftpboot/pxelinux.cfg/$$CN /tftpboot/petitboot/$$CN; do [ -f "$f" ] || continue; seen=1; if grep -q "selinux=0" "$f"; then ok=1; echo "BOOTCFG-OK: $f"; else echo "BOOTCFG-NOFLAG: $f"; fi; done; [ "$seen" = 1 ] || echo "BOOTCFG-BAD: the node has no boot configuration"; [ "$ok" = 1 ] || echo "BOOTCFG-BAD: no boot configuration carries selinux=0"'
cmd:sh -c 'ok=0; seen=0; for f in /tftpboot/xcat/ipxe/nodes/$$CN.uefi /tftpboot/xcat/ipxe/nodes/$$CN /tftpboot/xcat/xnba/nodes/$$CN /tftpboot/pxelinux.cfg/$$CN /tftpboot/petitboot/$$CN; do [ -f "$f" ] || continue; seen=1; if grep -q "selinux=0" "$f"; then ok=1; echo "BOOTCFG-OK: $f"; else echo "BOOTCFG-NOFLAG: $f"; fi; done; [ "$seen" = 1 ] || echo "BOOTCFG-BAD: the node has no boot configuration"; [ "$ok" = 1 ] || echo "BOOTCFG-BAD: no boot configuration carries selinux=0"'
check:output=~BOOTCFG-OK:
check:output!~BOOTCFG-BAD:
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/commoncmd/retry_install.sh $$CN __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -200,7 +200,7 @@ check:rc==0
cmd:nodeset $$CN osimage=$$STATELITE
check:rc==0
check:output=~SELinux is disabled
cmd:sh -c 'grep -rh "selinux=0" /tftpboot/xcat/xnba/nodes/$$CN /tftpboot/pxelinux.cfg/$$CN /tftpboot/petitboot/$$CN 2>/dev/null | wc -l'
cmd:sh -c 'grep -rh "selinux=0" /tftpboot/xcat/ipxe/nodes/$$CN.uefi /tftpboot/xcat/ipxe/nodes/$$CN /tftpboot/xcat/xnba/nodes/$$CN /tftpboot/pxelinux.cfg/$$CN /tftpboot/petitboot/$$CN 2>/dev/null | wc -l'
check:rc==0
check:output!~^0$
cmd:chdef -t node -o $$CN selinux=