From cb3dca58d9d226e02319c59e77a46db38ab1fd3a Mon Sep 17 00:00:00 2001
From: litingt <litingt@cn.ibm.com>
Date: Wed, 14 Nov 2018 22:06:12 -0500
Subject: [PATCH] update 2 wrong cases, rmimage and makedhcp_n_linux

---
 xCAT-test/autotest/testcase/makedhcp/cases0 | 2 +-
 xCAT-test/autotest/testcase/ngpfb/cases0    | 9 ---------
 xCAT-test/autotest/testcase/rmimage/case0   | 3 ++-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index e4c1d685a..359c5a97d 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -34,7 +34,7 @@ end
 
 start:makedhcp_n_linux
 description:Create a new dhcp configuration file with a network statement for each network the dhcp daemon should listen on
-label:ci_test
+label:others,ci_test
 os:Linux
 cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi
 cmd:makedhcp -n
diff --git a/xCAT-test/autotest/testcase/ngpfb/cases0 b/xCAT-test/autotest/testcase/ngpfb/cases0
index 6ef0c8dcf..e3604488d 100644
--- a/xCAT-test/autotest/testcase/ngpfb/cases0
+++ b/xCAT-test/autotest/testcase/ngpfb/cases0
@@ -1,7 +1,6 @@
 #comments:make sure you have compute node definition on your MN
 #this case is just supplement for some commands,after your executing,check output from log
 start:lsslp_cmm
-
 description:for part of ngp firebird commands
 label:others,hctrl_fsp
 cmd:makedhcp -n
@@ -14,7 +13,6 @@ check:output=~(groups=cmm,all)
 end
 
 start:rspconfig_snmp_ssh
-
 description:rspconfig snmpcfg sshcfg
 label:others,hctrl_fsp
 cmd:makehosts cmm
@@ -35,7 +33,6 @@ check:output=~enabled
 end
 
 start:rscan_cmm
-
 description:rscan cmm
 label:others,hctrl_fsp
 cmd:rscan cmm
@@ -55,7 +52,6 @@ check:output=~OK
 end
 
 start:rspconfig_textid
-
 description:rspconfig textid
 label:others,hctrl_fsp
 cmd:rspconfig $$CN textid=abc123
@@ -78,7 +74,6 @@ check:output=~(\w+)(.*?)\1
 end
 
 start:rspconfig_hwconn
-
 description:for hwconn
 label:others,hctrl_fsp
 cmd:rmhwconn $$CN
@@ -102,7 +97,6 @@ check:output=~(LINE UP)
 end
 
 start:rpower_bladenode
-
 description:rpower
 label:others,hctrl_fsp
 cmd:rpower $$CN off
@@ -116,7 +110,6 @@ check:output=~Success
 end
 
 start:rspconfig_solcfg
-
 description:for solcfg
 label:others,hctrl_fsp
 cmd:rspconfig cmm solcfg=enable
@@ -132,7 +125,6 @@ check:output!~enable
 end
 
 start:getmacs_d_blade
-
 description:getmacs
 label:others,hctrl_fsp
 cmd:makeconservercf
@@ -148,7 +140,6 @@ check:output=~[a-f0-9A-F]{12}|[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0-9A-F]{2}:[a-f0
 end
 
 start:rinv_firm_fb
-
 description:check firmware level
 label:others,hctrl_fsp
 cmd:rinv $$CN firm
diff --git a/xCAT-test/autotest/testcase/rmimage/case0 b/xCAT-test/autotest/testcase/rmimage/case0
index a5f1ea566..991efd372 100644
--- a/xCAT-test/autotest/testcase/rmimage/case0
+++ b/xCAT-test/autotest/testcase/rmimage/case0
@@ -1,6 +1,7 @@
 start:rmimage_diskless
-descriptiion:This case is to test rmimage could work correctly to remove all image files.
+description:This case is to test rmimage could work correctly to remove all image files.
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute.bak;fi
+label:others,packaging
 cmd:copycds $$ISO
 check:rc==0
 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute