From 5846b6569bd276dd5626deb31d4e27b5d09d8031 Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 11 Dec 2018 20:52:03 -0500 Subject: [PATCH 1/5] update case updatenode_without_flag to verify bug 5142 --- xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 1 + xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle | 1 + xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle | 1 + xCAT-test/autotest/testcase/updatenode/cases0 | 8 ++++++++ 4 files changed, 11 insertions(+) diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle index b1137d0bf..2563620e9 100644 --- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle @@ -1,6 +1,7 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v +updatenode_without_flag updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle index 060343ce4..25395ff9f 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle @@ -1,6 +1,7 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v +updatenode_without_flag updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle index e458f98cf..e6aed8398 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle @@ -4,6 +4,7 @@ reg_linux_diskfull_installation_flat go_xcat_noinput updatenode_h updatenode_v +updatenode_without_flag updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir diff --git a/xCAT-test/autotest/testcase/updatenode/cases0 b/xCAT-test/autotest/testcase/updatenode/cases0 index fef099f08..3a23fb8a8 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases0 +++ b/xCAT-test/autotest/testcase/updatenode/cases0 @@ -11,6 +11,14 @@ check:rc==0 check:output=~Version end +start:updatenode_without_flag +description:this case is to verify defect 5142; updatenode without options causes command to crash. +label:others,updatenode +cmd:updatenode +check:rc!=0 +check:output=~Usage +end + start:updatenode_diskful_syncfiles label:others,updatenode cmd:mkdir -p /install/custom/install/__GETNODEATTR($$CN,os)__/ From cc5044d32670e0fca919a545cbcc50e050e51511 Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 11 Dec 2018 21:02:29 -0500 Subject: [PATCH 2/5] update to avoid the case conflict --- xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 2 +- xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle | 2 +- xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle index 2563620e9..896555dda 100644 --- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle @@ -1,7 +1,7 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v -updatenode_without_flag +updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle index 25395ff9f..3696240ac 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle @@ -1,7 +1,7 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v -updatenode_without_flag +updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle index e6aed8398..9e36b9e48 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle @@ -4,7 +4,7 @@ reg_linux_diskfull_installation_flat go_xcat_noinput updatenode_h updatenode_v -updatenode_without_flag +updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir From 05c75d6ac15b876617fb38f771a05c90b72f72ca Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 11 Dec 2018 21:03:13 -0500 Subject: [PATCH 3/5] update case name --- xCAT-test/autotest/testcase/updatenode/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/updatenode/cases0 b/xCAT-test/autotest/testcase/updatenode/cases0 index 3a23fb8a8..7afb70a8f 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases0 +++ b/xCAT-test/autotest/testcase/updatenode/cases0 @@ -11,7 +11,7 @@ check:rc==0 check:output=~Version end -start:updatenode_without_flag +start:updatenode_without_options description:this case is to verify defect 5142; updatenode without options causes command to crash. label:others,updatenode cmd:updatenode From ce7d62d55be2b2df6e1d4151e0760a48e93cc64e Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 11 Dec 2018 21:30:32 -0500 Subject: [PATCH 4/5] update the case name --- xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 2 +- xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle | 2 +- xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle index 896555dda..b7120f1b1 100644 --- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle @@ -1,7 +1,6 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v -updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir @@ -18,6 +17,7 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag +updatenode_without_options confignetwork_static_installnic confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle index 3696240ac..e4ed05563 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle @@ -1,7 +1,6 @@ reg_linux_diskfull_installation_flat updatenode_h updatenode_v -updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir @@ -18,6 +17,7 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag +updatenode_without_options confignetwork_static_installnic confignetwork_secondarynic_nicnetworks_updatenode_false confignetwork_secondarynic_nicips_updatenode_false diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle index 9e36b9e48..2ffd3fd2d 100644 --- a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle @@ -4,7 +4,6 @@ reg_linux_diskfull_installation_flat go_xcat_noinput updatenode_h updatenode_v -updatenode_without_options updatenode_diskful_syncfiles updatenode_diskful_syncfiles_rename updatenode_diskful_syncfiles_dir @@ -21,6 +20,7 @@ updatenode_diskful_syncfiles_P_script1 updatenode_script3 updatenode_P_script1_script2 updatenode_without_flag +updatenode_without_options confignetwork_static_installnic confignetwork_s_installnic_secondarynic_updatenode confignetwork_secondarynic_updatenode From c39670d309a27e3078572c53ac7aefa18e657d47 Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 11 Dec 2018 22:06:24 -0500 Subject: [PATCH 5/5] update case label --- xCAT-test/autotest/testcase/updatenode/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/updatenode/cases0 b/xCAT-test/autotest/testcase/updatenode/cases0 index 7afb70a8f..f917cae2f 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases0 +++ b/xCAT-test/autotest/testcase/updatenode/cases0 @@ -13,7 +13,7 @@ end start:updatenode_without_options description:this case is to verify defect 5142; updatenode without options causes command to crash. -label:others,updatenode +label:mn_only,ci_test,updatenode cmd:updatenode check:rc!=0 check:output=~Usage