xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-01-11 19:02:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7194 from xcat2/master

Browse Source 
Merge from master to 2.16 branch for 2.16.4 release. (2)
This commit is contained in:
Mark Gurevich
2022-06-08 08:03:34 -04:00
committed by GitHub
parent 2014264f96 a682cb0273
commit 505c884d9a
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
perl-xCAT/xCAT/data/discinfo.pm
View File

@@ -14,6 +14,7 @@ require Exporter;
use strict;
our %distnames = (
"1652648703.486923" => "rocky8.6", #x86_64
"1636882174.934804" => "rocky8.5", #x86_64
"1624205633.869423" => "rocky8.4", #x86_64
"1578087695.538488" => "centos8.1", #x86_64

10
xCAT-probe/xcatprobe
View File

@@ -100,7 +100,10 @@ sub format_cmd_output {
$msg =~ s/\t/ /g;
my $flaglen = 6;
my $desiredwidth = 120;
my $screenwidth = (`tput cols` + 0);
my $screenwidth = 80;
if ($ENV{'TERM'}) {
$screenwidth = (`tput cols` + 0);
}
my $maxlen = ($screenwidth > $desiredwidth ? $desiredwidth : $screenwidth);
my @finalmsg = ();
@@ -194,7 +197,10 @@ sub listvalidsubcmd {
$maxlen += 4;
my $desiredwidth = 120;
my $screenwidth = (`tput cols` + 0);
my $screenwidth = 80;
if ($ENV{'TERM'}) {
$screenwidth = (`tput cols` + 0);
}
my $finallen = ($screenwidth > $desiredwidth ? $desiredwidth : $screenwidth);
print "Supported sub commands are:\n";

10
xCAT-test/autotest/testcase/genesis/genesistest.pl
View File

@@ -285,7 +285,15 @@ sub testxdsh {
return 1;
}
send_msg(2, "Node $noderange has been installed with genesis shell for test value $value \n");
# Check shell prompt on the node to verify it is running Genesis
`xdsh $noderange -t 2 "echo \\\$PS1" | grep "Genesis"`;
if ($?) {
send_msg(2, "Failed to install node $noderange with genesis shell for test value $value \n");
return 1;
} else {
send_msg(2, "Node $noderange has been installed with genesis shell for test value $value \n");
}
send_msg(2, "Checking $checkfile file on that node contains '$checkstring' \n");
my $xdsh_command="xdsh $noderange -t 2 cat $checkfile 2>&1";
if (($value == 1) || ($value == 2) || ($value == 3)) {

23
xCAT-test/autotest/testcase/install_xCAT/case0
View File

@@ -20,8 +20,17 @@ cmd:service xcatd status
check:rc==0
check:output=~running
cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2
end
# Check host keys supported by the operating system and report new ones, if any.
cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
check:rc==0
cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
check:rc==0
cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
check:output!~>
cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
check:rc==0
end
start:install_xCAT_on_ubuntu
description:install xCAT with go-xcat tool in a fresh environment for ubuntu
@@ -57,6 +66,14 @@ cmd:service conserver stop
cmd:sleep 5
cmd:service goconserver status
cmd:service conserver status
# Check host keys supported by the operating system and report new ones, if any.
cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
check:rc==0
cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
check:rc==0
cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
check:output!~>
cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
check:rc==0
end

2
xCAT/postscripts/enablekdump
View File

@@ -247,6 +247,8 @@ EOF
echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf
echo "default shell" >> /etc/kdump.conf
echo "path /var/crash" >> /etc/kdump.conf
echo "core_collector makedumpfile -c --message-level 1 -d 31" >> /etc/kdump.conf
#strip "xcat" out of the initramfs for kdump
echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf
#strip the unnecessary kernel options from /proc/cmdline