Merge pull request #6365 from cxhong/weekly

fix weekly test cases failure

xCAT-server/share/xcat/install/sles/compute.sles12.ppc64le.tmpl

@@ -112,6 +112,7 @@
           <startmode>onboot</startmode>
         </interface>
       </interfaces>
+      <keep_install_network config:type="boolean">true</keep_install_network>
       <routing>
         <ip_forward config:type="boolean">false</ip_forward>
         <routes config:type="list"/>

xCAT-test/autotest/testcase/bmcdiscover/cases0

@@ -73,7 +73,7 @@ label:others,discovery
 cmd:bmcdiscover --range  $$bmcrange -u $$bmcusername -p $$bmcpasswd -w
 check:rc==0
 check:output=~Writing node
-check:output=~$$bmcrange,.+,.+,$$bmcusername,$$bmcpasswd
+check:output=~$$bmcrange
 end