Merge pull request #2645 from junxiawang/0315

modify bundle list according to disk diskless case modify
2025-08-21 18:50:28 +00:00 · 2017-04-11 10:22:06 +08:00
parent 5f5730926a 6700d84976
commit cf06123a0a
12 changed files with 24 additions and 24 deletions
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
--- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
--- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n_noderange
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n_noderange
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
--- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
--- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x