From 926e3e06f4f947658cbf12823ffa29beddb228d4 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Mon, 25 Jul 2016 04:04:08 -0400 Subject: [PATCH] fix bug: can't pull xcat install log back in ubunut --- xCAT-server/share/xcat/tools/jenkins/xcatjktest | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xCAT-server/share/xcat/tools/jenkins/xcatjktest b/xCAT-server/share/xcat/tools/jenkins/xcatjktest index cb28293a8..0d2ed43ec 100755 --- a/xCAT-server/share/xcat/tools/jenkins/xcatjktest +++ b/xCAT-server/share/xcat/tools/jenkins/xcatjktest @@ -825,11 +825,10 @@ sub install_xcat { &runcmd("xdsh $mn 'apt-get -y install xcat xcat-test > $installlog 2>&1' >/dev/null 2>&1"); if($?){ send_msg(0, "[install_xcat] apt-get -y install xcat xCAT-test in $mn failed"); - return 1; + }else{ + &runcmd("xdsh $mn 'mkdir -p /install/$os/%arch/install/netboot '"); + &runcmd("scp /install/$os/%arch/install/netboot/initrd.gz $mn:/install/%os/%arch/install/netboot "); } - - &runcmd("xdsh $mn 'mkdir -p /install/$os/%arch/install/netboot '"); - &runcmd("scp /install/$os/%arch/install/netboot/initrd.gz $mn:/install/%os/%arch/install/netboot "); } }