Merge pull request #219 from richm/tags-for-nvme-scsi

tag tests that use NVME and SCSI

Author: richm

tests/scripts/generate_tests.py

@@ -24,12 +24,16 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::%s
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "%s"
 
 - import_playbook: %s
+  tags:
+    - tests::%s
 """
 
 # list of interfaces which will have their files generated
@@ -47,7 +51,7 @@ def generate_file(org_filename, iface):
     gen_path_file = path.join(TARGET_PATH, generate_filename(org_filename, iface))
 
     with open(gen_path_file, "w") as f:
-        f.write(TEST_FILE_CONTENTS % (iface, org_filename))
+        f.write(TEST_FILE_CONTENTS % (iface, iface, org_filename, iface))
 
 
 # will new test be generated based on this item?

tests/tests_change_disk_fs_nvme_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::nvme
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "nvme"
 
 - import_playbook: tests_change_disk_fs.yml
+  tags:
+    - tests::nvme

tests/tests_change_disk_fs_scsi_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::scsi
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "scsi"
 
 - import_playbook: tests_change_disk_fs.yml
+  tags:
+    - tests::scsi

tests/tests_change_disk_mount_nvme_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::nvme
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "nvme"
 
 - import_playbook: tests_change_disk_mount.yml
+  tags:
+    - tests::nvme

tests/tests_change_disk_mount_scsi_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::scsi
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "scsi"
 
 - import_playbook: tests_change_disk_mount.yml
+  tags:
+    - tests::scsi

tests/tests_change_fs_nvme_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::nvme
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "nvme"
 
 - import_playbook: tests_change_fs.yml
+  tags:
+    - tests::nvme

tests/tests_change_fs_scsi_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::scsi
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "scsi"
 
 - import_playbook: tests_change_fs.yml
+  tags:
+    - tests::scsi

tests/tests_change_fs_use_partitions_nvme_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::nvme
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "nvme"
 
 - import_playbook: tests_change_fs_use_partitions.yml
+  tags:
+    - tests::nvme

tests/tests_change_fs_use_partitions_scsi_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::scsi
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "scsi"
 
 - import_playbook: tests_change_fs_use_partitions.yml
+  tags:
+    - tests::scsi

tests/tests_change_mount_nvme_generated.yml

@@ -1,9 +1,13 @@
 ---
 # This file was generated by generate_tests.py
 - hosts: all
+  tags:
+    - tests::nvme
   tasks:
     - name: set disk interface for test
       set_fact:
         storage_test_use_interface: "nvme"
 
 - import_playbook: tests_change_mount.yml
+  tags:
+    - tests::nvme