Merge ~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg:refactor_testplan_with_nested into ~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg:master

[Vincent Liao]

Modify: Seperate realtime testplan from generic testplan.

Description
-----------
This MR is to seperate realtime testplan from generic test plan.

Changed
-------
1. Remove realtime related jobs or testplans from generic testplan.
    - tsn
    - rt-performance-tests-stress
2. Create realtime testplan, basically it's the same as generic test plan, but
    - Add tsn and rt-performance-tests-stress
    - Remove suspend related tests

Diff
----
1. For core testplan: https://pastebin.canonical.com/p/hB8gtMdMWT/
2. For desktop testplan: https://pastebin.canonical.com/p/RRJjzb79N7/
3. For server testplan: https://pastebin.canonical.com/p/GC8BdPHcTK/

Linked MR
---------
https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-iiotg/+merge/444358
https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-iiotg/+merge/444359
https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-iiotg-classic/+merge/444361
https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-iiotg-classic/+merge/444362

[Rick Wu (rickwu4444)]

@Vincent,
Please see my in-line comments.

review: Needs Fixing

[Vincent Liao (liaou3)]

@Rick
Please see my reply. Thanks!

[Vic Liu (zongminl)]

- Please update the copyright year to 2023 on the files you touched
- +1 to what Rick mentions in the review, let's use the full name of Intel IoTG in the description (maybe in a separated commit to do this change to all the test plans)
- checkbox-iiotg is missing 'rt-tests' stage-package definition in order for cyclictest to run, please raise another MR for cyclictest to be able to start running in core images (ref: https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic/tree/snap/snapcraft.yaml#n64)

Please also check my incline comments for more details to be fixed

review: Needs Fixing

[Vincent Liao (liaou3)]

@Vic

Please see my in-line reply for the question.

[Vic Liu (zongminl)]

- Please update the copyright year to 2023
- Please use "Intel IoTG" in the name/description/summary strings instead of "intel iotg"
- Please remove all the series 20 (desktop 20.04, server 20.04 and ubuntu core 20) RT test plans, we don't need to support RT on focal
- Let's use regex power-management-cpu-cstate/.* to exclude the jobs we don't want them to run

review: Needs Fixing

[Vincent Liao (liaou3)]

@Vic @Rick

What I fixed
------------
1. change name from "intliotg" to "intel iotg" for being mre human readable in the field of name and description in testplan.
2. Update copyright from 2022 to 2023.
3. Remove realtime test on 20 due to it only support on 22 now.
4. Exclude all jobs under "power-management-cpu-cstate" category in realtime automated testplan.

Later works
------------
1. checkbox-iiotg is missing 'rt-tests' stage-package definition in order for cyclictest to run, I would raise another MR for cyclictest to be able to start running in core images (ref: https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic/tree/snap/snapcraft.yaml#n64)
2. I will squash all commit into one before merge into main branch.

[Vic Liu (zongminl)]

Some more minor changes need to be made. you can consider this MR approved once you've done the chages:
- Use "Intel IoTG" instead of "intel iotg"
- Correct the indentation in intliotg-desktop-22-04-automated-rt

review: Approve

[Rick Wu (rickwu4444)]

LGTM

review: Approve

[Vincent Liao (liaou3)]

I have squashed all commits into one, ready to merge.

diff --git a/units/test-plan-core-rt.pxu b/units/test-plan-core-rt.pxu
new file mode 100644
index 0000000..c113fdc
--- /dev/null
+++ b/units/test-plan-core-rt.pxu
@@ -0,0 +1,58 @@
+# Copyright 2023 Canonical Ltd.
+# All rights reserved.
+#
+# Test plans and (optionally) jobs unique to the realtime Ubuntu Core Intel IoTG devices.
+#
+
+id: intliotg-ubuntucore-22-rt
+unit: test plan
+_name: Intel IoTG - Full manual + automated tests for realtime Ubuntu Core 22
+_description:
+ Combined manual and automated test plans for realtime Ubuntu Core Intel IoTG devices.
+include:
+nested_part:
+    intliotg-ubuntucore-22-manual-rt
+    intliotg-ubuntucore-22-automated-rt
+
+id: intliotg-ubuntucore-22-manual-rt
+unit: test plan
+_name: Intel IoTG - Manual only QA tests for realtime Ubuntu Core 22
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the tests that require manual control of device
+ hardware or some other user input to complete.
+estimated_duration: 3600
+include:
+nested_part:
+    intliotg-ubuntucore-22-manual
+    tsn-manual
+exclude:
+    .*::.*suspend.*
+
+id: intliotg-ubuntucore-22-automated-rt
+unit: test plan
+_name: Intel IoTG - Automated only QA tests for realtime Ubuntu Core 22
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the automated tests used to validate the realtime
+ Intel IoTG device.
+include:
+nested_part:
+    intliotg-ubuntucore-22-automated
+    tsn-automated
+exclude:
+    .*::.*suspend.*
+    power-management-cpu-cstate/.*
+
+id: intliotg-ubuntucore-22-stress-rt
+unit: test plan
+_name: Intel IoTG - Stress tests for realtime Ubuntu Core 22
+_description:
+ Ubuntu Core QA test plan that includes all stress tests required for
+ realtime Intel IoTG devices.
+include:
+nested_part:
+    intliotg-ubuntucore-22-stress
+    rt-performance-tests-stress
+exclude:
+    .*::.*suspend.*
diff --git a/units/test-plan-core.pxu b/units/test-plan-core.pxu
index 0fab369..dc7a11e 100644
--- a/units/test-plan-core.pxu
+++ b/units/test-plan-core.pxu
@@ -1,14 +1,14 @@
 # Copyright 2022 Canonical Ltd.
 # All rights reserved.
 #
-# Test plans and (optionally) jobs unique to the Ubuntu Core intliotg devices.
+# Test plans and (optionally) jobs unique to the Ubuntu Core Intel IoTG devices.
 #
 
 id: intliotg-ubuntucore-22
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Core 22
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Core 22
 _description:
- Combined manual and automated test plans for Ubuntu Core intliotg devices.
+ Combined manual and automated test plans for Ubuntu Core Intel IoTG devices.
 include:
 nested_part:
     intliotg-ubuntucore-22-manual
@@ -16,9 +16,9 @@ nested_part:
 
 id: intliotg-ubuntucore-20
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Core 20
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Core 20
 _description:
- Combined manual and automated test plans for Ubuntu Core intliotg devices.
+ Combined manual and automated test plans for Ubuntu Core Intel IoTG devices.
 include:
 nested_part:
     intliotg-ubuntucore-20-manual
@@ -26,9 +26,9 @@ nested_part:
 
 id: intliotg-ubuntucore-22-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Core 22
+_name: Intel IoTG - Manual only QA tests for Ubuntu Core 22
 _description:
- Ubuntu Core QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Core QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -42,7 +42,6 @@ nested_part:
     com.canonical.certification::edac-manual
     usb-dwc3-manual
     ishtp-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.qa.ceoem::ce-oem-manual
@@ -54,9 +53,9 @@ exclude:
 
 id: intliotg-ubuntucore-20-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Core 20
+_name: Intel IoTG - Manual only QA tests for Ubuntu Core 20
 _description:
- Ubuntu Core QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Core QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -70,7 +69,6 @@ nested_part:
     com.canonical.certification::edac-manual
     usb-dwc3-manual
     ishtp-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.certification::client-cert-iot-ubuntucore-20-manual
@@ -80,10 +78,10 @@ exclude:
 
 id: intliotg-ubuntucore-22-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Core 22
+_name: Intel IoTG - Automated only QA tests for Ubuntu Core 22
 _description:
- Ubuntu Core QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Core QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
     com.canonical.certification::image/model-grade
     com.canonical.certification::miscellanea/secure_boot_mode_.*               # keep if secure boot is enabled
@@ -96,7 +94,6 @@ nested_part:
     com.canonical.certification::edac-automated
     usb-dwc3-automated
     ishtp-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
@@ -109,10 +106,10 @@ exclude:
 
 id: intliotg-ubuntucore-20-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Core 20
+_name: Intel IoTG - Automated only QA tests for Ubuntu Core 20
 _description:
- Ubuntu Core QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Core QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
     com.canonical.certification::image/model-grade
     com.canonical.certification::miscellanea/secure_boot_mode_.*               # keep if secure boot is enabled
@@ -125,7 +122,6 @@ nested_part:
     com.canonical.certification::edac-automated
     usb-dwc3-automated
     ishtp-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-iot-ubuntucore-20-automated
@@ -136,9 +132,9 @@ exclude:
 
 id: intliotg-ubuntucore-22-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Core 22
+_name: Intel IoTG - Stress tests for Ubuntu Core 22
 _description:
- Ubuntu Core QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Core QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     device-connections-tp
@@ -149,9 +145,9 @@ exclude:
 
 id: intliotg-ubuntucore-20-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Core 20
+_name: Intel IoTG - Stress tests for Ubuntu Core 20
 _description:
- Ubuntu Core QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Core QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     device-connections-tp
@@ -159,4 +155,3 @@ nested_part:
     com.canonical.certification::client-cert-iot-ubuntucore-20-stress
 exclude:
     com.canonical.certification::stress-tests/hibernate.*
-
diff --git a/units/test-plan-desktop-rt.pxu b/units/test-plan-desktop-rt.pxu
new file mode 100644
index 0000000..efb6515
--- /dev/null
+++ b/units/test-plan-desktop-rt.pxu
@@ -0,0 +1,58 @@
+# Copyright 2023 Canonical Ltd.
+# All rights reserved.
+#
+# Test plans and (optionally) jobs unique to the realtime Ubuntu Desktop Intel IoTG devices.
+#
+
+id: intliotg-desktop-22-04-rt
+unit: test plan
+_name: Intel IoTG - Full manual + automated tests for realtime Ubuntu Desktop 22.04
+_description:
+ Combined manual and automated test plans for realtime Ubuntu Desktop Intel IoTG devices.
+include:
+nested_part:
+    intliotg-desktop-22-04-manual-rt
+    intliotg-desktop-22-04-automated-rt
+
+id: intliotg-desktop-22-04-manual-rt
+unit: test plan
+_name: Intel IoTG - Manual only QA tests for realtime Ubuntu Desktop 22.04
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the tests that require manual control of device
+ hardware or some other user input to complete.
+estimated_duration: 3600
+include:
+nested_part:
+    intliotg-desktop-22-04-manual
+    tsn-manual
+exclude:
+    .*::.*suspend.*
+
+id: intliotg-desktop-22-04-automated-rt
+unit: test plan
+_name: Intel IoTG - Automated only QA tests for realtime Ubuntu Desktop 22.04
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the automated tests used to validate the realtime
+ Intel IoTG device.
+include:
+nested_part:
+    intliotg-desktop-22-04-automated
+    tsn-automated
+exclude:
+    .*::.*suspend.*
+    power-management-cpu-cstate/.*
+
+id: intliotg-desktop-22-04-stress-rt
+unit: test plan
+_name: Intel IoTG - Stress tests for realtime Ubuntu Desktop 22.04 image
+_description:
+ Ubuntu Core QA test plan that includes all stress tests required for
+ realtime Intel IoTG devices.
+include:
+nested_part:
+    intliotg-desktop-22-04-stress
+    rt-performance-tests-stress
+exclude:
+    .*::.*suspend.*
diff --git a/units/test-plan-desktop.pxu b/units/test-plan-desktop.pxu
index 1220382..4938653 100644
--- a/units/test-plan-desktop.pxu
+++ b/units/test-plan-desktop.pxu
@@ -1,14 +1,14 @@
 # Copyright 2022 Canonical Ltd.
 # All rights reserved.
 #
-# Test plans and (optionally) jobs unique to the Ubuntu Desktop intliotg devices.
+# Test plans and (optionally) jobs unique to the Ubuntu Desktop Intel IoTG devices.
 #
 
 id: intliotg-desktop-22-04
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Desktop 22.04
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Desktop 22.04
 _description:
- Combined manual and automated test plans for Ubuntu Desktop intliotg devices.
+ Combined manual and automated test plans for Ubuntu Desktop Intel IoTG devices.
 include:
 nested_part:
     intliotg-desktop-22-04-manual
@@ -16,9 +16,9 @@ nested_part:
 
 id: intliotg-desktop-20-04
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Desktop 20.04
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Desktop 20.04
 _description:
- Combined manual and automated test plans for Ubuntu Desktop intliotg devices.
+ Combined manual and automated test plans for Ubuntu Desktop Intel IoTG devices.
 include:
 nested_part:
     intliotg-desktop-20-04-manual
@@ -26,9 +26,9 @@ nested_part:
 
 id: intliotg-desktop-22-04-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Desktop 22.04
+_name: Intel IoTG - Manual only QA tests for Ubuntu Desktop 22.04
 _description:
- Ubuntu Desktop QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Desktop QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -40,7 +40,6 @@ nested_part:
     usb-dwc3-manual
     ishtp-manual
     va-api-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.qa.ceoem::ce-oem-manual
@@ -57,9 +56,9 @@ exclude:
 
 id: intliotg-desktop-20-04-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Desktop 20.04
+_name: Intel IoTG - Manual only QA tests for Ubuntu Desktop 20.04
 _description:
- Ubuntu Desktop QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Desktop QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -71,7 +70,6 @@ nested_part:
     usb-dwc3-manual
     ishtp-manual
     va-api-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.certification::client-cert-desktop-20-04-manual
@@ -86,10 +84,10 @@ exclude:
 
 id: intliotg-desktop-22-04-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Desktop 22.04
+_name: Intel IoTG - Automated only QA tests for Ubuntu Desktop 22.04
 _description:
- Ubuntu Desktop QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Desktop QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
 nested_part:
     watchdog-intliotg-automated
@@ -99,7 +97,6 @@ nested_part:
     usb-dwc3-automated
     ishtp-automated
     va-api-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
@@ -110,10 +107,10 @@ exclude:
 
 id: intliotg-desktop-20-04-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Desktop 20.04
+_name: Intel IoTG - Automated only QA tests for Ubuntu Desktop 20.04
 _description:
- Ubuntu Desktop QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Desktop QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
 nested_part:
     watchdog-intliotg-automated
@@ -123,7 +120,6 @@ nested_part:
     usb-dwc3-automated
     ishtp-automated
     va-api-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-desktop-20-04-automated
@@ -132,26 +128,24 @@ exclude:
 
 id: intliotg-desktop-22-04-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Desktop 22.04 image
+_name: Intel IoTG - Stress tests for Ubuntu Desktop 22.04 image
 _description:
- Ubuntu Desktop QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Desktop QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     com.canonical.certification::stress-iperf3-automated                       # keep if ethernet is supported
     com.canonical.certification::client-cert-iot-server-22-04-stress
-    rt-performance-tests-stress
 exclude:
     com.canonical.certification::stress-tests/hibernate.*
 
 id: intliotg-desktop-20-04-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Desktop 20.04 image
+_name: Intel IoTG - Stress tests for Ubuntu Desktop 20.04 image
 _description:
- Ubuntu Desktop QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Desktop QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     com.canonical.certification::stress-iperf3-automated                       # keep if ethernet is supported
     com.canonical.certification::client-cert-iot-server-20-04-stress
 exclude:
     com.canonical.certification::stress-tests/hibernate.*
-
diff --git a/units/test-plan-server-rt.pxu b/units/test-plan-server-rt.pxu
new file mode 100644
index 0000000..bfeed6f
--- /dev/null
+++ b/units/test-plan-server-rt.pxu
@@ -0,0 +1,57 @@
+# Copyright 2023 Canonical Ltd.
+# All rights reserved.
+#
+# Test plans and (optionally) jobs unique to the realtime Ubuntu Server Intel IoTG devices.
+#
+
+id: intliotg-server-22-04-rt
+unit: test plan
+_name: Intel IoTG - Full manual + automated tests for realtime Ubuntu Server 22.04
+_description:
+ Combined manual and automated test plans for realtime Ubuntu Server Intel IoTG devices.
+include:
+nested_part:
+    intliotg-server-22-04-manual-rt
+    intliotg-server-22-04-automated-rt
+
+id: intliotg-server-22-04-manual-rt
+unit: test plan
+_name: Intel IoTG - Manual only QA tests for realtime Ubuntu Server 22.04
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the tests that require manual control of device
+ hardware or some other user input to complete.
+estimated_duration: 3600
+include:
+nested_part:
+    intliotg-server-22-04-manual
+    tsn-manual
+exclude:
+    .*::.*suspend.*
+
+id: intliotg-server-22-04-automated-rt
+unit: test plan
+_name: Intel IoTG - Automated only QA tests for realtime Ubuntu Server 22.04
+_description:
+ Ubuntu Core QA test plan for the realtime Intel IoTG hardware. This test
+ plan contains all of the automated tests used to validate the realtime
+ Intel IoTG device.
+include:
+nested_part:
+    intliotg-server-22-04-automated
+    tsn-automated
+exclude:
+    .*::.*suspend.*
+    power-management-cpu-cstate/.*
+
+id: intliotg-server-22-04-stress-rt
+unit: test plan
+_name: Intel IoTG - Stress tests for realtime Ubuntu Server 22.04
+_description:
+ Ubuntu Core QA test plan that includes all stress tests required for
+ realtime Intel IoTG devices.include:
+nested_part:
+    intliotg-server-22-04-stress
+    rt-performance-tests-stress
+exclude:
+    .*::.*suspend.*
diff --git a/units/test-plan-server.pxu b/units/test-plan-server.pxu
index 8d86eb2..1871951 100644
--- a/units/test-plan-server.pxu
+++ b/units/test-plan-server.pxu
@@ -1,14 +1,14 @@
 # Copyright 2022 Canonical Ltd.
 # All rights reserved.
 #
-# Test plans and (optionally) jobs unique to the Ubuntu Server intliotg devices.
+# Test plans and (optionally) jobs unique to the Ubuntu Server Intel IoTG devices.
 #
 
 id: intliotg-server-22-04
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Server 22.04
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Server 22.04
 _description:
- Combined manual and automated test plans for Ubuntu Server intliotg devices.
+ Combined manual and automated test plans for Ubuntu Server Intel IoTG devices.
 include:
 nested_part:
     intliotg-server-22-04-manual
@@ -16,9 +16,9 @@ nested_part:
 
 id: intliotg-server-20-04
 unit: test plan
-_name: intliotg - Full manual + automated tests for Ubuntu Server 20.04
+_name: Intel IoTG - Full manual + automated tests for Ubuntu Server 20.04
 _description:
- Combined manual and automated test plans for Ubuntu Server intliotg devices.
+ Combined manual and automated test plans for Ubuntu Server Intel IoTG devices.
 include:
 nested_part:
     intliotg-server-20-04-manual
@@ -26,9 +26,9 @@ nested_part:
 
 id: intliotg-server-22-04-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Server 22.04
+_name: Intel IoTG - Manual only QA tests for Ubuntu Server 22.04
 _description:
- Ubuntu Server QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Server QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -39,7 +39,6 @@ nested_part:
     com.canonical.certification::edac-manual
     usb-dwc3-manual
     ishtp-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.qa.ceoem::ce-oem-manual
@@ -52,9 +51,9 @@ exclude:
 
 id: intliotg-server-20-04-manual
 unit: test plan
-_name: intliotg - Manual only QA tests for Ubuntu Server 20.04
+_name: Intel IoTG - Manual only QA tests for Ubuntu Server 20.04
 _description:
- Ubuntu Server QA test plan for the intliotg hardware. This test plan contains
+ Ubuntu Server QA test plan for the Intel IoTG hardware. This test plan contains
  all of the tests that require manual control of device hardware
  or some other user input to complete.
 estimated_duration: 3600
@@ -65,7 +64,6 @@ nested_part:
     com.canonical.certification::edac-manual
     usb-dwc3-manual
     ishtp-manual
-    tsn-manual
     thermal-manual
     intel-mei-manual
     com.canonical.certification::client-cert-iot-server-20-04-manual
@@ -75,10 +73,10 @@ exclude:
 
 id: intliotg-server-22-04-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Server 22.04
+_name: Intel IoTG - Automated only QA tests for Ubuntu Server 22.04
 _description:
- Ubuntu Server QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Server QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
 nested_part:
     watchdog-intliotg-automated
@@ -87,7 +85,6 @@ nested_part:
     com.canonical.certification::edac-automated
     usb-dwc3-automated
     ishtp-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
@@ -99,10 +96,10 @@ exclude:
 
 id: intliotg-server-20-04-automated
 unit: test plan
-_name: intliotg - Automated only QA tests for Ubuntu Server 20.04
+_name: Intel IoTG - Automated only QA tests for Ubuntu Server 20.04
 _description:
- Ubuntu Server QA test plan for the intliotg hardware. This test plan contains
- all of the automated tests used to validate the intliotg device.
+ Ubuntu Server QA test plan for the Intel IoTG hardware. This test plan contains
+ all of the automated tests used to validate the Intel IoTG device.
 include:
 nested_part:
     watchdog-intliotg-automated
@@ -111,7 +108,6 @@ nested_part:
     com.canonical.certification::edac-automated
     usb-dwc3-automated
     ishtp-automated
-    tsn-automated
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-iot-server-20-04-automated
@@ -121,26 +117,24 @@ exclude:
 
 id: intliotg-server-22-04-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Server 22.04
+_name: Intel IoTG - Stress tests for Ubuntu Server 22.04
 _description:
- Ubuntu Server QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Server QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     com.canonical.certification::stress-iperf3-automated                       # keep if ethernet is supported
     com.canonical.certification::client-cert-iot-server-22-04-stress
-    rt-performance-tests-stress
 exclude:
     com.canonical.certification::stress-tests/hibernate.*
 
 id: intliotg-server-20-04-stress
 unit: test plan
-_name: intliotg - Stress tests for Ubuntu Server 20.04
+_name: Intel IoTG - Stress tests for Ubuntu Server 20.04
 _description:
- Ubuntu Server QA test plan that includes all stress tests required for intliotg devices
+ Ubuntu Server QA test plan that includes all stress tests required for Intel IoTG devices
 include:
 nested_part:
     com.canonical.certification::stress-iperf3-automated                       # keep if ethernet is supported
     com.canonical.certification::client-cert-iot-server-20-04-stress
 exclude:
     com.canonical.certification::stress-tests/hibernate.*
-