diff --git a/xCAT-test/autotest/testcase/copycds/cases0 b/xCAT-test/autotest/testcase/copycds/cases0 index 7f2632131..b1d796fd5 100644 --- a/xCAT-test/autotest/testcase/copycds/cases0 +++ b/xCAT-test/autotest/testcase/copycds/cases0 @@ -1,5 +1,6 @@ start:copycds_iso os:Linux +label:others cmd:rm -rf /install/__GETNODEATTR($$CN,os)__ #cmd:umount /mnt/xcat cmd:copycds $$ISO @@ -11,6 +12,7 @@ check:rc==0 end start:lskmodules_o +label:others cmd:lskmodules -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__ check:rc==0 check:output=~.ko(.xz): @@ -19,6 +21,7 @@ end start:copycds_n os:Linux +label:others #cmd:umount /mnt/xca cmd:rm -rf /install/__GETNODEATTR($$CN,os)__ cmd:copycds -n __GETNODEATTR($$CN,os)__ $$ISO @@ -33,6 +36,7 @@ end start:copycds_a os:Linux +label:others #cmd:umount /mnt/xcat cmd:copycds -a __GETNODEATTR($$CN,arch)__ $$ISO check:rc==0 @@ -44,6 +48,7 @@ end start:copycds_n_a os:Linux +label:others #cmd:umount /mnt/xcat cmd:copycds -n __GETNODEATTR($$CN,os)__ -a __GETNODEATTR($$CN,arch)__ $$ISO check:rc==0 @@ -55,6 +60,7 @@ end start:copycds_a_err os:Linux +label:others #cmd:umount /mnt/xcat cmd:copycds -a 386 $$ISO check:output=~Error @@ -62,6 +68,7 @@ end start:copycds_n_err os:Linux +label:others #cmd:umount /mnt/xcat cmd:copycds -n aix $$ISO check:rc!=0 @@ -70,6 +77,7 @@ end start:copycds_p os:Linux +label:others #cmd:umount /mnt/xcat cmd:mkdir -p /install/tmp cmd:copycds -p /install/tmp $$ISO @@ -84,6 +92,7 @@ end start:copycds_path os:Linux +label:others #cmd:umount /mnt/xcat cmd:mkdir -p /install/tmp cmd:copycds --path /install/tmp $$ISO @@ -99,6 +108,7 @@ end start:copycds_i os:Linux +label:others cmd:copycds -i $$ISO check:rc==0 check:output=~OS Image:$$ISO @@ -109,6 +119,7 @@ end start:copycds_inspection os:Linux +label:others cmd:copycds --inspection $$ISO check:rc==0 check:output=~OS Image:$$ISO @@ -119,6 +130,7 @@ end start:copycds_o os:Linux +label:others cmd:copycds -o $$ISO check:rc==0 check:output=~Copying media to /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__ @@ -129,6 +141,7 @@ end start:copycds_noosimage os:Linux +label:others cmd:copycds --noosimage $$ISO check:rc==0 check:output=~Copying media to /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__ @@ -139,6 +152,7 @@ end start:copycds_w os:Linux +label:others cmd:copycds $$ISO check:rc==0 cmd:copycds -w $$ISO @@ -149,6 +163,7 @@ end start:copycds_w2 os:Linux +label:others cmd:rm -rf /install/__GETNODEATTR($$CN,os)__ check:rc==0 cmd:copycds -w $$ISO @@ -159,6 +174,7 @@ end start:copycds_nonoverwrite os:Linux +label:others cmd:copycds $$ISO check:rc==0 cmd:copycds --nonoverwrite $$ISO @@ -168,6 +184,7 @@ end start:copycds_nonoverwrite2 os:Linux +label:others cmd:rm -rf /install/__GETNODEATTR($$CN,os)__ check:rc==0 cmd:copycds --nonoverwrite $$ISO @@ -178,6 +195,7 @@ end start:copycds_p_newdir os:Linux +label:others cmd:if [ -e /install/newdir ];then mv /install/newdir /install/newdirbak; fi cmd:copycds $$ISO -p /install/newdir check:rc==0 @@ -191,6 +209,7 @@ end start:copycds_p_noninstalldir os:Linux +label:others cmd:if [ -e /noninstalldir ];then mv /noninstalldir /noninstaldirbak; fi cmd:copycds $$ISO -p /noninstalldir check:rc==0 diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0 index c1cb737be..3446a4ca2 100644 --- a/xCAT-test/autotest/testcase/dockercommand/cases0 +++ b/xCAT-test/autotest/testcase/dockercommand/cases0 @@ -118,6 +118,7 @@ end start:rpower_pause_docker decription:pause all processes in the instance +label:others,docker cmd:chdef $$DOCKERCN dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker check:rc==0 cmd:makehosts $$DOCKERCN diff --git a/xCAT-test/autotest/testcase/ngpfb/cases0 b/xCAT-test/autotest/testcase/ngpfb/cases0 index d7e811de0..6ef0c8dcf 100644 --- a/xCAT-test/autotest/testcase/ngpfb/cases0 +++ b/xCAT-test/autotest/testcase/ngpfb/cases0 @@ -48,7 +48,7 @@ check:rc==0 end start:rspconfig_network - +label:others,hctrl_fsp cmd:rspconfig $$CN network=* check:rc==0 check:output=~OK diff --git a/xCAT-test/autotest/testcase/nodeset/cases0 b/xCAT-test/autotest/testcase/nodeset/cases0 index f4fc5b5ed..6080691da 100644 --- a/xCAT-test/autotest/testcase/nodeset/cases0 +++ b/xCAT-test/autotest/testcase/nodeset/cases0 @@ -1,5 +1,6 @@ start:nodeset_stat os:Linux +label:others cmd:nodeset $$CN stat check:rc==0 check:output=~$$CN:\s+[discover|boot|reboot|install|netboot|shell|standby] @@ -10,6 +11,7 @@ end start:nodeset_noderange os:Linux +label:others cmd:nodeset $$CN test check:rc!=0 check:output=~Error @@ -17,6 +19,7 @@ end start:nodeset_check_yaboot_no os:rhels +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=rhels7.5 netboot=yaboot @@ -33,6 +36,7 @@ end start:nodeset_check_yaboot_yes os:rhels +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=rhels5.5 netboot=yaboot @@ -49,6 +53,7 @@ end start:nodeset_check_grub2_yes os:rhels +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=rhels7.5 netboot=grub2 @@ -64,6 +69,7 @@ end start:nodeset_check_grub2_no os:rhels +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=rhels6.8 netboot=grub2 @@ -80,6 +86,7 @@ end start:nodeset_check_grub2_ubuntu os:ubuntu +label:others cmd:mkdef -t node -o testnode1 arch=x86_64 cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm monserver=10.1.1.1 nameservers=10.1.1.1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=ubuntu14.04.5 netboot=grub2 @@ -96,6 +103,7 @@ end start:nodeset_check_grub2_sles11 os:sles +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=sles11.4 netboot=grub2 @@ -111,6 +119,7 @@ end start:nodeset_check_yaboot_sles11 os:sles +label:others cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=sles11.4 netboot=yaboot @@ -126,6 +135,7 @@ end start:nodeset_check_grub2_sles12 os:sles +label:others cmd:mkdef -t node -o testnode1 arch=ppc64el cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm monserver=10.1.1.1 nameservers=10.1.1.1 1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=sles12 netboot=grub2 @@ -141,6 +151,7 @@ end start:nodeset_check_yaboot_sles12 os:sles +label:others cmd:mkdef -t node -o testnode1 arch=ppc64el cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm monserver=10.1.1.1 nameservers=10.1.1.1 1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=sles12 netboot=yaboot @@ -156,6 +167,7 @@ end start:nodeset_check_petitboot os:rhels +label:others cmd:mkdef -t node -o testnode1 arch=ppc64el cons=ipmi groups=pbmc mgt=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 check:rc==0 cmd:chdef testnode1 os=rhels7.5 netboot=petitboot @@ -169,6 +181,7 @@ cmd:noderm testnode1 end start:nodeset_check_warninginfo +label:others cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "el" || "__GETNODEATTR($$CN,arch)__" =~ "le" ]]; then bootloader=xnba; else bootloader=petitboot; fi; mkdef -t node -o testnode1 arch=ppc64el cons=ipmi groups=pbmc mgt=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 netboot=$bootloader check:rc==0 cmd:lsdef testnode1 @@ -179,6 +192,7 @@ end start:nodeset_xnba description: Verify when xnba is used for OS loader, whether the configuration files under /tftpboot can be generated corrently +label:others cmd:rmdef testnode1 cmd:rm -f /tftpboot/xcat/xnba/nodes/testnode1 /tftpboot/xcat/xnba/nodes/testnode1.elilo cmd:mkdef -t node -o testnode1 arch=x86_64 cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm profile=compute os=rhels6.99 @@ -220,6 +234,7 @@ end start:nodeset_grub2 description: Verify when grub2 is used for OS loader, whether the configuration files under /tftpboot can be generated corrently +label:others cmd:rmdef testnode1 cmd:rm -f /tftpboot/boot/grub2/{testnode1,grub.cfg-{01-e6-d4-d2-3a-ad-06,0[aA]0101[cC]8}} cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc profile=compute os=rhels7.99 @@ -264,6 +279,7 @@ end start:nodeset_petitboot description: Verify when petitboot is used for OS loader, whether the configuration files under /tftpboot can be generated corrently +label:others cmd:rmdef testnode1 cmd:rm -f /tftpboot/petitboot/testnode1 cmd:mkdef -t node -o testnode1 arch=ppc64le cons=bmc groups=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=ipmi profile=compute os=rhels7.99 @@ -305,6 +321,7 @@ end start:nodeset_yaboot description: Verify when yaboot is used for OS loader, whether the configuration files under /tftpboot can be generated corrently +label:others cmd:rmdef testnode1 cmd:rm -f /tftpboot/yaboot.conf-e6-d4-d2-3a-ad-06 cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc profile=compute os=rhels6.99 @@ -346,6 +363,7 @@ end start:nodeset_errorcommand description:This testcase is to very nodeset osimage errorcommand could give right output +label:others Attribute: $$CN-The operation object of nodeset command cmd:nodeset $$CN osimage= __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute check:rc==1 @@ -355,6 +373,7 @@ end start:nodeset_disjointdhcps_petitboot description: Verify the disjointdhcps feature when petitboot is used for OS loader. +label:others cmd:rmdef testnode1 cmd:rm -f /tftpboot/petitboot/testnode1 cmd:mkdef -t node -o testnode1 arch=ppc64le cons=bmc groups=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=ipmi profile=compute os=rhels7.99 @@ -454,6 +473,7 @@ end start:nodeset_switch_osimage description: This case is to verify if xcat supports nodeset osimage command for cumulus switch. This case is for bug 5126. os:Linux +label:others cmd:copycds $$CUMULUSOS |tee /tmp/cumulusimage check:rc==0 cmd:grep "The image" /tmp/cumulusimage |sed -r 's/.*\image(.*)\is.*/\1/' |tee /tmp/imagename diff --git a/xCAT-test/autotest/testcase/pdu/case0 b/xCAT-test/autotest/testcase/pdu/case0 index 16a8dd14d..952021ef8 100644 --- a/xCAT-test/autotest/testcase/pdu/case0 +++ b/xCAT-test/autotest/testcase/pdu/case0 @@ -1,5 +1,6 @@ start:lsdef_pdu_object -degscription:list pdu object and it's attribute +description:list pdu object and it's attribute +label:others cmd:lsdef -h check:output=~pdu cmd:mkdef $$PDU mgt=pdu nodetype=pdu groups=pdu diff --git a/xCAT-test/autotest/testcase/runcmdinstaller/cases0 b/xCAT-test/autotest/testcase/runcmdinstaller/cases0 index 8adefa9b1..d81df8c25 100644 --- a/xCAT-test/autotest/testcase/runcmdinstaller/cases0 +++ b/xCAT-test/autotest/testcase/runcmdinstaller/cases0 @@ -1,11 +1,13 @@ start:runcmdinstaller_h -descriptiop:runcmdinstaller -h +description:runcmdinstaller -h +label:others,postscripts cmd:runcmdinstaller -h check:rc==0 check:output=~runcmdinstaller end start:runcmdinstaller_command -descriptiop:runcmdinstaller +description:runcmdinstaller +label:others,postscripts cmd:chtab key=xcatdebugmode site.value="2" check:rc==0 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute