From 89fb46a37977edb67fd1bc0d2e182d52aa912b53 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 14 Jul 2016 08:41:15 -0400 Subject: [PATCH] add genesis testcase for autotest --- xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/sles11.4_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/sles12.1_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/sles12_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/sles12_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle | 3 +++ xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle | 3 +++ xCAT-test/autotest/testcase/genesis/cases0 | 2 +- 15 files changed, 43 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle index f207c7154..61895f193 100644 --- a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle @@ -196,6 +196,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle index a23e9e257..3eb078815 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle @@ -192,6 +192,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg redhat_migration1 redhat_migration2 clean_up_env diff --git a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle index 3fbc91c8b..88c8dec6c 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle @@ -197,6 +197,9 @@ switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V nodeset_check_warninginfo +nodeset_shell +nodeset_cmdline +nodeset_runimg reg_linux_diskless_installation_flat reg_linux_statelite_installation_flat SN_setup_case diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle index 76fa7c6de..c2bdbc84b 100644 --- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle @@ -200,6 +200,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo xcatd_start xcatd_stop diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle index 4435fbcc2..fbe5b25ca 100644 --- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle @@ -196,6 +196,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start_systemd xcatd_stop_systemd xcatd_restart_systemd diff --git a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle index fc971be5b..1381b3c1b 100644 --- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle @@ -200,6 +200,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo xcatd_start_systemd xcatd_stop_systemd diff --git a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle index 4435fbcc2..fbe5b25ca 100644 --- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle @@ -196,6 +196,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start_systemd xcatd_stop_systemd xcatd_restart_systemd diff --git a/xCAT-test/autotest/bundle/sles12_x86_64.bundle b/xCAT-test/autotest/bundle/sles12_x86_64.bundle index 1cac18c63..e0714d5ad 100644 --- a/xCAT-test/autotest/bundle/sles12_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12_x86_64.bundle @@ -200,6 +200,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo xcatd_start_systemd xcatd_stop_systemd diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle index 43e2804ee..c15d8835d 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle @@ -234,6 +234,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start xcatd_stop xcatd_restart diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle index d7c88748f..9847cc792 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle @@ -242,6 +242,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo Full_installation_flat_docker rpower_stop diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle index 9990fb91d..90028983a 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle @@ -234,6 +234,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start xcatd_stop xcatd_restart diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle index 7c70fa1b9..f8e5006ad 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle @@ -242,6 +242,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg nodeset_check_warninginfo Full_installation_flat_docker rpower_stop diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle index cbe8a9844..0857fb8ae 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle @@ -234,6 +234,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start_systemd xcatd_stop_systemd xcatd_restart_systemd diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle index d1affab41..15c77f4a6 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle @@ -242,6 +242,9 @@ switchdiscover_range_r switchdiscover_range_x switchdiscover_range_z switchdiscover_range_z_V +nodeset_shell +nodeset_cmdline +nodeset_runimg xcatd_start_systemd xcatd_stop_systemd xcatd_restart_systemd diff --git a/xCAT-test/autotest/testcase/genesis/cases0 b/xCAT-test/autotest/testcase/genesis/cases0 index a42c2101a..9459ff83d 100644 --- a/xCAT-test/autotest/testcase/genesis/cases0 +++ b/xCAT-test/autotest/testcase/genesis/cases0 @@ -7,7 +7,7 @@ check:rc==0 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -t -n $$CN cmd:xdsh $$CN cat /proc/cmdline check:rc==0 -check:output=~BOOT_IMAGE=/xcat/genesis.kernel +check:output=~destiny=shell cmd:nodeset $$CN boot cmd:rpower $$CN boot check:rc==0