From 4dd1407d059abc2212de82afcc770a37fecc5cb9 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 17 May 2017 07:09:50 -0400 Subject: [PATCH 1/3] Migration test just need to run under flat environment or will two dns server:SN and MN for CN --- .../autotest/testcase/migration/redhat_migration | 12 ++++++------ xCAT-test/autotest/testcase/migration/sles_migration | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-test/autotest/testcase/migration/redhat_migration b/xCAT-test/autotest/testcase/migration/redhat_migration index 27a489882..0cd7f859c 100644 --- a/xCAT-test/autotest/testcase/migration/redhat_migration +++ b/xCAT-test/autotest/testcase/migration/redhat_migration @@ -2,9 +2,9 @@ start:redhat_migration1 os:Linux description:update xCAT from $$MIGRATION1_VERSION to latest version, these two global parameter defined in config file -#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 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:rscan __GETNODEATTR($$CN,hcp)__ -w check:rc==0 cmd:makedns -n @@ -103,9 +103,9 @@ os:Linux description:update xCAT from $$MIGRATION2_VERSION to latest version, these two global parameter defined in config file 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 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:rscan __GETNODEATTR($$CN,hcp)__ -w check:rc==0 cmd:makedns -n diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration index e287ec852..a03bfc0d3 100644 --- a/xCAT-test/autotest/testcase/migration/sles_migration +++ b/xCAT-test/autotest/testcase/migration/sles_migration @@ -2,9 +2,9 @@ start:sles_migration1 os:Linux description:update xCAT from $$MIGRATION1_VERSION to latest version, these two global parameter defined in config file -#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 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:rscan __GETNODEATTR($$CN,hcp)__ -w check:rc==0 cmd:makedns -n @@ -105,9 +105,9 @@ start:sles_migration2 os:Linux description:update xCAT from $$MIGRATION22VERSION to latest version, these two global parameter defined in config file -#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 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:rscan __GETNODEATTR($$CN,hcp)__ -w check:rc==0 cmd:makedns -n From d4dd40c292ad8f3ea71e09b6580614c89d1f9fde Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 17 May 2017 08:19:23 -0400 Subject: [PATCH 2/3] add stop lable for Dev to debug --- xCAT-test/autotest/testcase/installation/SN_setup_case | 2 +- .../testcase/installation/reg_linux_diskfull_installation_flat | 2 +- .../installation/reg_linux_diskfull_installation_hierarchy | 2 +- .../testcase/installation/reg_linux_diskless_installation_flat | 2 +- .../installation/reg_linux_diskless_installation_hierarchy | 2 +- .../testcase/installation/reg_linux_statelite_installation_flat | 2 +- .../reg_linux_statelite_installation_hierarchy_by_nfs | 2 +- .../reg_linux_statelite_installation_hierarchy_by_ramdisk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/SN_setup_case b/xCAT-test/autotest/testcase/installation/SN_setup_case index 271427394..ee92b76c2 100644 --- a/xCAT-test/autotest/testcase/installation/SN_setup_case +++ b/xCAT-test/autotest/testcase/installation/SN_setup_case @@ -1,4 +1,4 @@ -start:SN_setup_case +start:SN_setup_case:stop:yes os:Linux cmd:fdisk -l cmd:df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat index b5ef8f841..62c61bf97 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -1,4 +1,4 @@ -start:reg_linux_diskfull_installation_flat +start:reg_linux_diskfull_installation_flat:stop:yes os:Linux cmd:fdisk -l cmd:df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy index a3a04ba54..28d2392cd 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -1,4 +1,4 @@ -start:reg_linux_diskfull_installation_hierarchy +start:reg_linux_diskfull_installation_hierarchy:stop:yes os:Linux cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat index a6e90df47..12fdda8dd 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -1,4 +1,4 @@ -start:reg_linux_diskless_installation_flat +start:reg_linux_diskless_installation_flat:stop:yes os:Linux cmd:fdisk -l cmd:df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy index 5e16e29af..e689d60f8 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -1,4 +1,4 @@ -start:reg_linux_diskless_installation_hierarchy +start:reg_linux_diskless_installation_hierarchy:stop:yes os:Linux cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index 829460d05..f4937fdc9 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -1,4 +1,4 @@ -start:reg_linux_statelite_installation_flat +start:reg_linux_statelite_installation_flat:stop:yes os:Linux cmd:fdisk -l cmd:df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 7c8e83622..7a6f561c7 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -1,4 +1,4 @@ -start:reg_linux_statelite_installation_hierarchy_by_nfs +start:reg_linux_statelite_installation_hierarchy_by_nfs:stop:yes os:Linux cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk index c2140c00d..3bc4f5e95 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk @@ -1,4 +1,4 @@ -start:reg_linux_statelite_installation_hierarchy_by_ramdisk +start:reg_linux_statelite_installation_hierarchy_by_ramdisk:stop:yes os:Linux cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T From 3b78dff3a0142e9176b04eeb0b2d9d88404ee03c Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 17 May 2017 08:26:37 -0400 Subject: [PATCH 3/3] add stop lable for Dev to debug --- xCAT-test/autotest/testcase/installation/SN_setup_case | 3 ++- .../testcase/installation/reg_linux_diskfull_installation_flat | 3 ++- .../installation/reg_linux_diskfull_installation_hierarchy | 3 ++- .../testcase/installation/reg_linux_diskless_installation_flat | 3 ++- .../installation/reg_linux_diskless_installation_hierarchy | 3 ++- .../installation/reg_linux_statelite_installation_flat | 3 ++- .../reg_linux_statelite_installation_hierarchy_by_nfs | 3 ++- .../reg_linux_statelite_installation_hierarchy_by_ramdisk | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/installation/SN_setup_case b/xCAT-test/autotest/testcase/installation/SN_setup_case index ee92b76c2..330bdeaa2 100644 --- a/xCAT-test/autotest/testcase/installation/SN_setup_case +++ b/xCAT-test/autotest/testcase/installation/SN_setup_case @@ -1,5 +1,6 @@ -start:SN_setup_case:stop:yes +start:SN_setup_case os:Linux +stop:yes cmd:fdisk -l cmd:df -T cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat index 62c61bf97..cbe7a6991 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat @@ -1,5 +1,6 @@ -start:reg_linux_diskfull_installation_flat:stop:yes +start:reg_linux_diskfull_installation_flat os:Linux +stop:yes cmd:fdisk -l cmd:df -T cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy index 28d2392cd..eca702914 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy @@ -1,5 +1,6 @@ -start:reg_linux_diskfull_installation_hierarchy:stop:yes +start:reg_linux_diskfull_installation_hierarchy os:Linux +stop:yes cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T cmd:xdsh $$SN "echo "test"> /test.hierarchy" diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat index 12fdda8dd..1541fae4b 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat @@ -1,5 +1,6 @@ -start:reg_linux_diskless_installation_flat:stop:yes +start:reg_linux_diskless_installation_flat os:Linux +stop:yes cmd:fdisk -l cmd:df -T cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy index e689d60f8..8ca853faa 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_hierarchy @@ -1,5 +1,6 @@ -start:reg_linux_diskless_installation_hierarchy:stop:yes +start:reg_linux_diskless_installation_hierarchy os:Linux +stop:yes cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T cmd:xdsh $$SN "echo "test"> /test.hierarchy" diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat index f4937fdc9..fa994e2c6 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_flat @@ -1,5 +1,6 @@ -start:reg_linux_statelite_installation_flat:stop:yes +start:reg_linux_statelite_installation_flat os:Linux +stop:yes cmd:fdisk -l cmd:df -T diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs index 7a6f561c7..cfb83253f 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_nfs @@ -1,5 +1,6 @@ -start:reg_linux_statelite_installation_hierarchy_by_nfs:stop:yes +start:reg_linux_statelite_installation_hierarchy_by_nfs os:Linux +stop:yes cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T cmd:xdsh $$SN "echo "test"> /test.hierarchy" diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk index 3bc4f5e95..a15e412f1 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk +++ b/xCAT-test/autotest/testcase/installation/reg_linux_statelite_installation_hierarchy_by_ramdisk @@ -1,5 +1,6 @@ -start:reg_linux_statelite_installation_hierarchy_by_ramdisk:stop:yes +start:reg_linux_statelite_installation_hierarchy_by_ramdisk os:Linux +stop:yes cmd:xdsh $$SN fdisk -l cmd:xdsh $$SN df -T cmd:xdsh $$SN "echo "test"> /test.hierarchy"