xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-16 11:24:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5110 from xcat2/master

Browse Source 
Merge master to 2.14 for 2.14 release(2)
This commit is contained in:
zet809
2018-04-16 19:08:36 +08:00
committed by GitHub
parent 3c96f72f2a 7deff9039e
commit 15a195be85
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/source/conf.py
+1 -1
View File
@@ -59,7 +59,7 @@ author = u'IBM Corporation'
# The short X.Y version.
version = '2'
# The full version, including alpha/beta/rc tags.
release = '2.13.11'
release = '2.14'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
docs/source/overview/xcat2_release.rst
+16
View File
@@ -7,6 +7,22 @@ The following table is a summary of the new operating system (OS), hardware, and
* **SLES** - Suse Linux Enterprise Server
* **UBT** - Ubuntu
xCAT 2.14.x
-----------
+---------------------------------+---------------+-------------+----------------------------------+
|xCAT |New OS |New |New Feature |
|Version | |Hardware | |
+=================================+===============+=============+==================================+
|| xCAT 2.14 |- RHEL 7.5 | |- OpenBMC support in python: |
|| 2018/4/20 | | | |
|| | | | rspconfig,reventlog |
| `2.14 Release Notes <https:// | | | |
| github.com/xcat2/xcat-core/wiki | | |- Performance Tuning doc update |
| /XCAT_2.14_Release_Notes>`_ | | | |
+---------------------------------+---------------+-------------+----------------------------------+
xCAT 2.13.x
-----------
xCAT-test/autotest/testcase/kdump/linux_diskless_kdump
+6 -3
View File
@@ -22,7 +22,7 @@ cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arc
check:rc==0
cmd:pkglistfile=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep pkglist|awk -F'=' '{print $2}'`;cp $pkglistfile $pkglistfile.bak
cmd:pkglistfile=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep pkglist|awk -F'=' '{print $2}'`; if grep SUSE /etc/*release;then echo -e "kdump\nkexec-tools\nmakedumpfile\n" >> $pkglistfile; elif grep "Red Hat" /etc/*release;then echo -e "kexec-tools\ncrash\n" >> $pkglistfile;fi
cmd:pkglistfile=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep pkglist|awk -F'=' '{print $2}'`; if grep SUSE /etc/*release;then echo -e "kdump\nkexec-tools\nmakedumpfile\nat\n" >> $pkglistfile; elif grep "Red Hat" /etc/*release;then echo -e "kexec-tools\ncrash\nat\n" >> $pkglistfile;fi
check:rc==0
cmd:exlistfile=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep exlist|awk -F'=' '{print $2}'`;cp $exlistfile $exlistfile.bak
@@ -46,7 +46,6 @@ check:rc==0
cmd:chdef -t node $$CN -p postscripts=enablekdump
check:rc==0
cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
check:rc==0
cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
@@ -69,7 +68,10 @@ cmd:xdsh $$CN date
check:rc==0
check:output=~\d\d:\d\d:\d\d
cmd:xdsh $$CN "setsid 'echo 1 > /proc/sys/kernel/sysrq; echo c > /proc/sysrq-trigger'"
cmd:xdsh $$CN "echo 'echo 1 > /proc/sys/kernel/sysrq; echo c > /proc/sysrq-trigger' > /tmp/kdump.trigger"
cmd:xdsh $$CN "chmod 755 /tmp/kdump.trigger"
cmd:xdsh $$CN "service atd start"
cmd:xdsh $$CN "at now +1 minutes <<< /tmp/kdump.trigger"
cmd:sleep 300
cmd:vmcorefile=`find /kdumpdir/ -name vmcore`;if [[ -s $vmcorefile ]]; then echo "this file is not empty";else echo "this file is empty"; fi
@@ -83,4 +85,5 @@ cmd:if [ -f /etc/exports.bak ] ;then mv -f /etc/exports.bak /etc/exports; fi
cmd:rm -rf /kdumpdir
cmd:cat /tmp/node.stanza | chdef -z;rm -rf /tmp/node.stanza
cmd:cat /tmp/osimage.stanza | chdef -z;rm -rf /tmp/osimage.stanza
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
end
xCAT/postscripts/cuda_power9_setup
+2 -2
View File
@@ -64,7 +64,7 @@ installkernel() {
install() {
[ -d \$initdir/etc/modprobe.d/ ] || mkdir \$initdir/etc/modprobe.d
echo 'options nvidia NVreg_RegistryDwords="RMNumaOnlining=0x1;RMNvLinkSpeedControl=0x9;PeerMappingOverride=1"' >\$initdir/etc/modprobe.d/nvidia.conf
echo 'options nvidia NVreg_EnableStreamMemOPs=1 NVreg_RegistryDwords="PeerMappingOverride=1"' >\$initdir/etc/modprobe.d/nvidia.conf
}
EOF
@@ -72,7 +72,7 @@ chmod 0755 /usr/lib/dracut/modules.d/95nvidia/module-setup.sh
echo 'add_dracutmodules+=" nvidia "' >/etc/dracut.conf.d/nvidia_patch.conf
# Patch for the diskfull environment, or in case kernel module nvidia need to be reloaded
echo 'options nvidia NVreg_RegistryDwords="RMNumaOnlining=0x1;RMNvLinkSpeedControl=0x9;PeerMappingOverride=1"' >/etc/modprobe.d/nvidia.conf
echo 'options nvidia NVreg_EnableStreamMemOPs=1 NVreg_RegistryDwords="PeerMappingOverride=1"' >/etc/modprobe.d/nvidia.conf
# Redo the initrd image
kernel_version="$(for d in $(ls /lib/modules | sort -V) ; do : ; done && echo $d)"