From 386ae4ec06a04c2f253bec212c7ebf96958a68be Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Tue, 6 Dec 2016 21:25:35 -0500 Subject: [PATCH 1/7] Wrong repository name if osminorversion doesn't have comparison operator --- xCAT-buildkit/bin/buildkit | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index 846edad06..dc825a660 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -1390,7 +1390,10 @@ sub validate_bldkitconf $full_kitname .= '-' . $::bldkit_config->{kit}{entries}[0]->{osmajorversion}; } if (defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) { - my $kitminor = split /<=|>=|==|<|>/, $::bldkit_config->{kit}{entries}[0]->{osminorversion}; + my $kitminor = $::bldkit_config->{kit}{entries}[0]->{osminorversion}; + unless ($kitminor =~ /^\d/) { + $kitminor = split /<=|>=|==|<|>|=/, $::bldkit_config->{kit}{entries}[0]->{osminorversion}; + } if ((!defined($::bldkit_config->{kit}{entries}[0]->{osbasename})) || (!defined($::bldkit_config->{kit}{entries}[0]->{osmajorversion}))) { print "Error: Kit osminorversion attribute was specified but either Kit osbasename or Kit osmajorversion were not set. \n"; @@ -1501,7 +1504,10 @@ sub validate_bldkitconf } $reponame .= '-' . $kr->{osmajorversion}; if (defined($kr->{osminorversion})) { - my $krminor = split /<=|>=|==|<|>/, $kr->{osminorversion}; + my $krminor = $kr->{osminorversion}; + unless ($krminor =~ /^\d/) { + $krminor = split /<=|>=|==|<|>|=/, $kr->{osminorversion}; + } if ((defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) && ($::bldkit_config->{kit}{entries}[0]->{osminorversion} ne $kr->{osminorversion})) { @@ -1552,7 +1558,10 @@ sub validate_bldkitconf $compname .= '-' . $repo{osbasename}; $compname .= '-' . $repo{osmajorversion}; if (defined($repo{osminorversion})) { - my $minorversion = split /<=|>=|==|<|>/, $repo{osminorversion}; + my $minorversion = $repo{osminorversion}; + unless ($minorversion =~ /^\d/) { + $minorversion = split /<=|>=|==|<|>|=/, $repo{osminorversion}; + } $compname .= '.' . $minorversion; } $compname .= '-' . $repo{osarch}; @@ -1937,7 +1946,10 @@ sub validate_os my $repo_osinfo = "$repo->{osbasename}$repo->{osmajorversion}"; my $minorversion; if (defined($repo->{osminorversion})) { - $minorversion = split /<=|>=|==|<|>/, $repo->{osminorversion}; + $minorversion = $repo->{osminorversion}; + unless ($minorversion =~ /^\d/) { + $minorversion = split /<=|>=|==|<|>|=/, $repo->{osminorversion}; + } $repo_osinfo .= ".$minorversion"; } $repo_osinfo .= "-$repo->{osarch} "; From 0107b43bee489ae7864146848c68d6730dda2c10 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 7 Dec 2016 04:57:32 -0500 Subject: [PATCH 2/7] modify genesis testcase for nodeset shell case issue --- xCAT-test/autotest/testcase/genesis/genesistest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl index 4ba521608..a7301f1b3 100755 --- a/xCAT-test/autotest/testcase/genesis/genesistest.pl +++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl @@ -266,7 +266,7 @@ sub testxdsh { $checkstring = "testimg"; $checkfile = "/tmp/testresult"; } elsif ($value == 3) { - $checkstring = "xcatd=$master:3001"; + $checkstring = "destiny=shell"; $checkfile = "/proc/cmdline"; } if (($value == 1) || ($value == 2) || ($value == 3)) { From 0dda9e4d9ea67a5dfaabed28df0f918978d4ff3c Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Wed, 7 Dec 2016 01:21:41 -0500 Subject: [PATCH 3/7] complete --- xCAT-test/autotest/testcase/buildkit/cases0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-test/autotest/testcase/buildkit/cases0 b/xCAT-test/autotest/testcase/buildkit/cases0 index fd8fd2774..17149110d 100644 --- a/xCAT-test/autotest/testcase/buildkit/cases0 +++ b/xCAT-test/autotest/testcase/buildkit/cases0 @@ -103,6 +103,7 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro check:rc==0 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;buildkit buildrepo all check:rc==0 +check:output!~error cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir check:output=~prodkit-1.0-1 cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-* @@ -153,6 +154,7 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro check:rc==0 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;reponame=`cat buildkit.conf|grep kitrepoid|sed 's/ //g' |grep ^kitrepoid=|head -1|awk -F= '{print $2}'`;buildkit buildrepo $reponame check:rc==0 +check:output!~error cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir check:output=~prodkit-1.0-1 cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-* From 46daf64a9322de5971099a3610407f53130c3a61 Mon Sep 17 00:00:00 2001 From: immarvin Date: Wed, 7 Dec 2016 01:58:29 -0500 Subject: [PATCH 4/7] fix issue [DEV] 'makentp -a' always return 1 #2282 --- xCAT-server/lib/xcat/plugins/makentp.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/makentp.pm b/xCAT-server/lib/xcat/plugins/makentp.pm index f2e784751..9f404ae1c 100755 --- a/xCAT-server/lib/xcat/plugins/makentp.pm +++ b/xCAT-server/lib/xcat/plugins/makentp.pm @@ -454,11 +454,12 @@ sub process_request { }, $sub_req, -1, 1 ); + my $retcode=$::RUNCMD_RC; my $msg; foreach my $line (@$ret) { $msg .= "$line\n"; } - send_msg(\%request, 1, "$msg"); + send_msg(\%request, $retcode, "$msg"); } } From 40e9608cf45e1a5e366ec26c3099547c04adebd1 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Wed, 7 Dec 2016 02:10:32 -0500 Subject: [PATCH 5/7] To have xcat-genesis-script depended on xcat-genesis-base 2.13.0 or higher --- xCAT-genesis-scripts/debian/control-amd64 | 2 +- xCAT-genesis-scripts/debian/control-ppc64el | 2 +- xCAT-genesis-scripts/xCAT-genesis-scripts.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-genesis-scripts/debian/control-amd64 b/xCAT-genesis-scripts/debian/control-amd64 index 20b99c52e..ada257a83 100644 --- a/xCAT-genesis-scripts/debian/control-amd64 +++ b/xCAT-genesis-scripts/debian/control-amd64 @@ -7,7 +7,7 @@ Standards-Version: 3.9.2 Package: xcat-genesis-scripts-amd64 Architecture: all -Depends: xcat-genesis-base-amd64 +Depends: xcat-genesis-base-amd64 (>=2.13.0) Conflicts: xcat-genesis-scripts,xcat-genesis-scripts-x86-64 Replaces: xcat-genesis-scripts,xcat-genesis-scripts-x86-64 Description: xCAT genesis diff --git a/xCAT-genesis-scripts/debian/control-ppc64el b/xCAT-genesis-scripts/debian/control-ppc64el index 08459a6cf..825592d88 100644 --- a/xCAT-genesis-scripts/debian/control-ppc64el +++ b/xCAT-genesis-scripts/debian/control-ppc64el @@ -7,7 +7,7 @@ Standards-Version: 3.9.2 Package: xcat-genesis-scripts-ppc64 Architecture: all -Depends: xcat-genesis-base-ppc64 +Depends: xcat-genesis-base-ppc64 (>=2.13.0) Conflicts: xcat-genesis-scripts Replaces: xcat-genesis-scripts Description: xCAT genesis diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec index c10abfbf6..2dcd33925 100755 --- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec +++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec @@ -31,7 +31,7 @@ Vendor: IBM Corp Summary: xCAT Genesis netboot image - Core content URL: http://xcat.org Source1: xCAT-genesis-scripts.tar.bz2 -Requires: xCAT-genesis-base-%{tarch} +Requires: xCAT-genesis-base-%{tarch} >= 2:2.13.0 Buildroot: %{_localstatedir}/tmp/xCAT-genesis Packager: IBM Corp. From 7577ab8efe122f40566b3d9725aa7472b3f4d705 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 7 Dec 2016 07:04:40 -0500 Subject: [PATCH 6/7] SN ntp service setup --- xCAT-test/autotest/testcase/installation/SN_setup_case | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/SN_setup_case b/xCAT-test/autotest/testcase/installation/SN_setup_case index 7e8d25f37..9b6ea5490 100644 --- a/xCAT-test/autotest/testcase/installation/SN_setup_case +++ b/xCAT-test/autotest/testcase/installation/SN_setup_case @@ -34,7 +34,7 @@ cmd:chdef -t node $$SN groups=service,all check:rc==0 cmd:chdef -t group -o service profile=service primarynic=mac installnic=mac check:rc==0 -cmd:chdef -t group -o service setupnfs=1 setupdhcp=1 setuptftp=1 setupnameserver=1 setupconserver=1 +cmd:chdef -t group -o service setupnfs=1 setupdhcp=1 setuptftp=1 setupnameserver=1 setupconserver=1 setupntp=1 check:rc==0 cmd:chdef -t group -o service nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN monserver=$$MN check:rc==0 @@ -96,5 +96,6 @@ check:output=~/tftpboot on /tftpboot cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "x86_64" ]]; then if [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then xdsh $$SN "zypper -n install perl-Sys-Virt"; elif [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]];then xdsh $$SN "yum install -y perl-Sys-Virt";fi;fi check:rc==0 - +cmd:makentp -a +check:rc==0 end From 6495de9cdae682b82f078891492c317e6937438d Mon Sep 17 00:00:00 2001 From: immarvin Date: Wed, 7 Dec 2016 03:59:23 -0500 Subject: [PATCH 7/7] correct the path of genimage lock --- perl-xCAT/xCAT/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index d28ea58ae..af8f42fcf 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -4817,7 +4817,7 @@ sub acquire_lock_imageop { my $lock = xCAT::Utils->acquire_lock("$mylockfile", $NON_BLOCK); unless ($lock){ my $pidfd; - open($pidfd,"<","/var/run/lock/xcat/$mylockfile"); + open($pidfd,"<","/var/lock/xcat/$mylockfile"); my $pid=<$pidfd>; close($pidfd); return (1, "failed to acquire lock, seems there is another genimage/packimage/rmimage process $pid running on root image dir \"$rootimg_dir\"");