Move several test groups to hw nodes

Change-Id: I5d68668f0c2bdb85b2e08dac57421201df855b92

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
index fae0309f5c28689a13df2914b127377e5c24cccf..91895fdebe5ecd6cc93bcde3ed108308c348e76b 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
@@ -24,13 +24,10 @@
             ENABLE_BOOTMENU=false
         testgroup:
         - prepare_release
-        - bvt_2:
-            swarm-test/custom-overrides-plain-properties: ""
+        - bvt_2
         - jumbo_frames
         - thread_1
-        - ceph_ha_one_controller:
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=false
+        - ceph_ha_one_controller
         - one_controller_actions
         - multirole
         - thread_non_func_1
@@ -79,15 +76,7 @@
             swarm-test/custom-overrides-plain-properties: |
                 DISABLE_SSL=true
         - cgroup_ha
-        - support_dpdk:
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=true
         - custom_graph
-        - support_dpdk_bond:
-            swarm-test/env-name-suffix: "dpdk_bond"
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=true
-                BONDING=true
         - test_ibp
         - test_bdd
         - smoke_test_configdb:
@@ -106,17 +95,7 @@
                 UPDATE_MASTER=False
                 FORCE_DISABLE_UPDATES=True
                 NODES_COUNT=6
-        # test group below uses only 4 VMs at the same time so there is no need
-        # to put in in huge_systest node
-        - multiqueue_base_check:
-            swarm-test/env-name-suffix: "multiqueue"
-            swarm-test/custom-overrides-plain-properties: |
-              KVM_USE=true
-              SLAVE_NODE_CPU=6
         - ovs_firewall
-        - ovs_firewall_with_dpdk:
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=true
         - test_tags
 ##########################################
 #plugins base
@@ -151,12 +130,6 @@
             swarm-test/custom-overrides-plain-properties: |
                 MULTIPLE_NETWORKS=true
                 FUEL_STATS_ENABLED=true
-        - thread_usb:
-            swarm-test/env-name-suffix: "usb"
-            swarm-test/custom-overrides-plain-properties: |
-                ADMIN_BOOT_DEVICE=usb
-                SHOW_FUELMENU=true
-                ENABLE_BOOTMENU=true
         - unlock_settings_tab:
             swarm-test/timeout: '1800'
 ##########################################
@@ -214,39 +187,32 @@
             swarm-test/env-name-suffix: "master_migrate"
             swarm-test/custom-overrides-plain-properties: |
                 SLAVE_NODE_CPU=12
-        - numa_cpu_pinning:
-            swarm-test/timeout: '1200'
-            swarm-test/env-name-suffix: "numa_nodes"
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=true
-                SLAVE_NODE_CPU=12
-                DRIVER_ENABLE_ACPI=true
-                NUMA_NODES=2
-        - support_hugepages:
-            swarm-test/env-name-suffix: "hugepages"
-            swarm-test/custom-overrides-plain-properties: |
-                KVM_USE=True
-                DRIVER_ENABLE_ACPI=true
-                NUMA_NODES=2
-                SLAVE_NODE_CPU=12
-                ENV_SLAVE_LOGIN=root
-                ENV_SLAVE_PASSWORD=r00tme
-                # SLAVE_NODE_MEMORY=5120
         ##### plugin huge
         - thread_separate_haproxy:
             swarm-test/env-name-suffix: "haproxy-detach"
             swarm-test/custom-overrides-plain-properties: |
                 MULTIPLE_NETWORKS=true
                 USE_HAPROXY_TEMPLATE=true
+##########################################
+# Stub for huge tests with extended hdd
+#    - mos/templates/swarm-test:
+#        swarm-test/node: "mos.fuel.huge.hdd_ext"
+#        swarm-test/devops-hw-vars: |
+#            ADMIN_NODE_CPU=6
+#            SLAVE_NODE_CPU=12
+#            ADMIN_NODE_MEMORY=4096
+#            SLAVE_NODE_MEMORY=8192
+#            ENABLE_BOOTMENU=false
+#        testgroup:
+#        - TESTGROUP:
 ##########################################
     - mos/templates/swarm-test:
-        swarm-test/node: "mos.fuel.huge.hdd_ext"
+        swarm-test/node: "mos.hardware"
         swarm-test/devops-hw-vars: |
             ADMIN_NODE_CPU=6
             SLAVE_NODE_CPU=12
             ADMIN_NODE_MEMORY=4096
             SLAVE_NODE_MEMORY=8192
-            ENABLE_BOOTMENU=false
         testgroup:
         - deploy_multipath:
             swarm-test/env-name-suffix: "multipath"
@@ -256,4 +222,45 @@
                 SLAVE_NODE_CPU=12
                 DEVOPS_SETTINGS_TEMPLATE=$WORKSPACE/system_test/tests_templates/tests_configs/multipath_3_nodes.yaml
                 NODES_COUNT=4
-                NODE_VOLUME_SIZE=40
\ No newline at end of file
+                NODE_VOLUME_SIZE=40
+        - thread_usb:
+            swarm-test/env-name-suffix: "usb"
+            swarm-test/custom-overrides-plain-properties: |
+                ADMIN_BOOT_DEVICE=usb
+                SHOW_FUELMENU=true
+                ENABLE_BOOTMENU=true
+        # test group below uses only 4 VMs at the same time so there is no need
+        # to put in in huge_systest node
+        - multiqueue_base_check:
+            swarm-test/env-name-suffix: "multiqueue"
+            swarm-test/custom-overrides-plain-properties: |
+              KVM_USE=true
+              SLAVE_NODE_CPU=6
+        - ovs_firewall_with_dpdk:
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+        - support_dpdk_bond:
+            swarm-test/env-name-suffix: "dpdk_bond"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                BONDING=true
+        - support_dpdk:
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+        - numa_cpu_pinning:
+            swarm-test/timeout: '1200'
+            swarm-test/env-name-suffix: "numa_nodes"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                SLAVE_NODE_CPU=12
+                DRIVER_ENABLE_ACPI=true
+                NUMA_NODES=2
+        - support_hugepages:
+            swarm-test/env-name-suffix: "hugepages"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=True
+                DRIVER_ENABLE_ACPI=true
+                NUMA_NODES=2
+                SLAVE_NODE_CPU=12
+                ENV_SLAVE_LOGIN=root
+                ENV_SLAVE_PASSWORD=r00tme
\ No newline at end of file