xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

modify releating vm setup bundle and testcases

Browse Source
This commit is contained in:
junxiawang 2016-12-23 03:00:54 -05:00
parent 8be7f48080
commit 5882a134c8
28 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
makehosts_h
makehosts_help

1
xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
go_xcat_local_repo_case7
go_xcat_noinput

1
xCAT-test/autotest/bundle/sles12_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
makehosts_h

1
xCAT-test/autotest/bundle/sles12_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
reg_linux_diskfull_installation_flat
makehosts_h
makehosts_help

1
xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
makehosts_h

1
xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Ubuntu_diskless_installation_flat_x86_vm
Ubuntu_full_installation_flat_x86_vm
makehosts_h

1
xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Ubuntu_diskless_installation_flat_x86_vm
Ubuntu_full_installation_flat_x86_vm
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Ubuntu_diskless_installation_flat_x86_vm
Ubuntu_full_installation_flat_x86_vm
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Diskless_installation_flat_p8_le
Full_installation_flat_p8_le
go_xcat_local_repo_case7

1
xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
View File

@ -1,3 +1,4 @@
setup_vm
Ubuntu_diskless_installation_flat_x86_vm
Ubuntu_full_installation_flat_x86_vm
go_xcat_local_repo_case7

4
xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
View File

@ -3,10 +3,6 @@ os:Linux
description:check fresh install disk, usded for x86 multi disk only, and not check RH7.2 for RH os wwn isue.
cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=100"
cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=300 seek=60858"
cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata |grep -i $$CN; fi
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf

2
xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
View File

@ -4,8 +4,6 @@ description:check reinstall disk, usded for x86 multi disk only, and not check R
cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=100"
cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=300 seek=60858"
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf

4
xCAT-test/autotest/testcase/installation/setup_vm
View File

@ -1,12 +1,12 @@
start:setup_vm
description:set up vm environment
cmd:var=`expr substr "__GETNODEATTR($$CN,vmstorage)__" 1 3`;echo $var;if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f -p;if [[ "$var" = "phy" ]]; then mkvm $$CN;exit $? ; elif [[ "$var" = "dir" ]];then mkvm $$CN ; rmvm $$CN -f -p ; mkvm $$CN -s 20G ;exit $? ;elif [ "$var" = "nfs" -o "$var" = "lvm" -o "$var" = "nfs" ];then echo "Need to fix me. ";exit 2;else echo "Could not surpport vmstorage.";exit 3;fi;fi
cmd:var=`expr substr "__GETNODEATTR($$CN,vmstorage)__" 1 3`;echo $var;if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f -p;if [[ "$var" = "phy" ]]; then mkvm $$CN;exit $? ; elif [[ "$var" = "dir" ]];then mkvm $$CN ; rmvm $$CN -f -p ; mkvm $$CN -s 20G ;exit $? ;elif [ "$var" = "nfs" -o "$var" = "lvm" ];then echo "Need to fix me. ";exit 2;else echo "Could not surpport vmstorage.";exit 3;fi;fi
check:rc==0
cmd:rpower $$CN on
check:rc==0
cmd:rpower $$CN stat
check:output=~on
cmd:var=`expr substr "__GETNODEATTR($$SN,vmstorage)__" 1 3`;echo $var;if [ "__GETNODEATTR($$SN,arch)__" != "ppc64" -a "__GETNODEATTR($$SN,mgt)__" != "ipmi" ];then rmvm $$SN -f -p;if [[ "$var" = "phy" ]]; then mkvm $$SN;exit $? ; elif [[ "$var" = "dir" ]];then mkvm $$SN ; rmvm $$SN -f -p ; mkvm $$SN -s 20G ;exit $? ;elif [ "$var" = "nfs" -o "$var" = "lvm" -o "$var" = "nfs" ];then echo "Need to fix me. ";exit 2;else echo "Could not surpport vmstorage.";exit 3;fi;fi
cmd:var=`expr substr "__GETNODEATTR($$SN,vmstorage)__" 1 3`;echo $var;if [ "__GETNODEATTR($$SN,arch)__" != "ppc64" -a "__GETNODEATTR($$SN,mgt)__" != "ipmi" ];then rmvm $$SN -f -p;if [[ "$var" = "phy" ]]; then mkvm $$SN;exit $? ; elif [[ "$var" = "dir" ]];then mkvm $$SN ; rmvm $$SN -f -p ; mkvm $$SN -s 20G ;exit $? ;elif [ "$var" = "nfs" -o "$var" = "lvm" ];then echo "Need to fix me. ";exit 2;else echo "Could not surpport vmstorage.";exit 3;fi;fi
check:rc==0
cmd:rpower $$SN on
check:rc==0

6
xCAT-test/autotest/testcase/migration/redhat_migration
View File

@ -5,9 +5,6 @@ description:update xCAT from $$MIGRATION1_VERSION to $$LATEST_VERSION, these two
#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
#check:rc==0
cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata; fi
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p;mkvm $$CN;rmvm $$CN -f -p;mkvm $$CN -s 20G; fi;fi
cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
check:rc==0
cmd:makedns -n
@ -116,9 +113,6 @@ stop:yes
#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
#check:rc==0
cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata; fi
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p;mkvm $$CN;rmvm $$CN -f -p;mkvm $$CN -s 20G; fi;fi
cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
check:rc==0
cmd:makedns -n

6
xCAT-test/autotest/testcase/migration/sles_migration
View File

@ -5,9 +5,6 @@ description:update xCAT from $$MIGRATION1_VERSION to $$LATEST_VERSION, these two
#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
#check:rc==0
cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata; fi
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p;mkvm $$CN;rmvm $$CN -f -p;mkvm $$CN -s 20G; fi;fi
cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
check:rc==0
cmd:makedns -n
@ -118,9 +115,6 @@ description:update xCAT from $$MIGRATION22VERSION to $$LATEST_VERSION, these two
#cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
#cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
#check:rc==0
cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata; fi
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p;mkvm $$CN;rmvm $$CN -f -p;mkvm $$CN -s 20G; fi;fi
cmd:rscan __GETNODEATTR($$CN,hcp)__ -w
check:rc==0
cmd:makedns -n

6
xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful
View File

@ -4,8 +4,6 @@ description:site.xcatdebugmode value is 0, the following logs will be shown and
cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf
@ -68,8 +66,6 @@ check:rc==0
cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf
@ -161,8 +157,6 @@ check:rc==0
cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf

4
xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful
View File

@ -5,8 +5,6 @@ description:site.xcatdebugmode value is 0, the following logs will be shown and
cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf
@ -78,8 +76,6 @@ check:rc==0
cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p && mkvm $$CN; else rmvm $$CN -f -p && mkvm $$CN -s 20G; fi;fi
check:rc=0
cmd:makedns -n
check:rc==0
cmd:makeconservercf