Switch from mobilebroadband to wwan nested parts for cert test plans …

…(bugfix) (#1496) * Switch from mobilebroadband to wwan nested parts for cert test plans Following QA changes in #821¹ regarding the replacement of mobilebroadband-cert-.* nested part for their wwan-.* counterparts, the same is applied for: - client-cert-desktop-24-04 (it was missed in #821 due to bad timing) - client-cert-odm-desktop-2?-04 (to match what's being tested by the QA team) client-cert-odm-desktop-18-04 was not included due to the fact that Ubuntu 18.04 has seen EOL and therefore its related test plan is not actively maintained anymore. ¹ #821 * Add after-suspend-wwan-manual for homogeneity * Remove superseded jobs from [after-suspend-]wwan-manual nested parts wwan/detect-manual and wwan/check-sim-present-manual have an automated version available. wwan/gsm-connection-interrupted-manual depends on the manual versions of the detection and SIM verification jobs, and is therefore removed as well, as we have an automated connection job.
canonical · Sep 24, 2024 · 7182b16 · 7182b16
1 parent 2359309
commit 7182b16
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/providers/base/units/wwan/jobs.pxu b/providers/base/units/wwan/jobs.pxu
@@ -226,7 +226,7 @@ _steps:
 _verification:
  Was the connection revived after removing the Faraday bag?
 estimate_duration: 120s
-flags:  also-after-suspend
+flags: also-after-suspend
 category_id: wwan
 imports: from com.canonical.plainbox import manifest
 requires:

diff --git a/providers/base/units/wwan/test-plan.pxu b/providers/base/units/wwan/test-plan.pxu
@@ -48,15 +48,9 @@ unit: test plan
 _name: Manual wwan tests
 _description: Manual wwan tests for Snappy Ubuntu Core devices
 include:
-    wwan/detect-manual
-    wwan/check-sim-present-manual
-    wwan/gsm-connection-interrupted-manual
 
 id: after-suspend-wwan-manual
 unit: test plan
 _name: Manual wwan tests (after suspend)
 _description: Manual wwan tests for Snappy Ubuntu Core devices
 include:
-    after-suspend-wwan/detect-manual
-    after-suspend-wwan/check-sim-present-manual
-    after-suspend-wwan/gsm-connection-interrupted-manual
diff --git a/providers/certification-client/units/client-cert-desktop-20-04.pxu b/providers/certification-client/units/client-cert-desktop-20-04.pxu
@@ -65,6 +65,7 @@ nested_part:
     after-suspend-keys-cert-full
     after-suspend-led-cert-full
     after-suspend-mediacard-cert-full
+    after-suspend-wwan-manual
     after-suspend-optical-cert-full
     after-suspend-touchpad-cert-full
     after-suspend-touchscreen-cert-manual

diff --git a/providers/certification-client/units/client-cert-desktop-22-04.pxu b/providers/certification-client/units/client-cert-desktop-22-04.pxu
@@ -68,6 +68,7 @@ nested_part:
     after-suspend-keys-cert-full
     after-suspend-led-cert-full
     after-suspend-mediacard-cert-full
+    after-suspend-wwan-manual
     after-suspend-ethernet-manual
     after-suspend-networking-manual
     after-suspend-optical-cert-full

diff --git a/providers/certification-client/units/client-cert-desktop-24-04.pxu b/providers/certification-client/units/client-cert-desktop-24-04.pxu
@@ -35,7 +35,7 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -60,6 +60,7 @@ nested_part:
     after-suspend-keys-cert-full
     after-suspend-led-cert-full
     after-suspend-mediacard-cert-full
+    after-suspend-wwan-manual
     after-suspend-ethernet-manual
     after-suspend-networking-manual
     after-suspend-optical-cert-full
@@ -102,7 +103,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -123,7 +124,7 @@ nested_part:
     after-suspend-cpu-cert-automated
     after-suspend-input-cert-automated
     after-suspend-disk-cert-automated
-    after-suspend-mobilebroadband-cert-automated
+    after-suspend-wwan-automated
     after-suspend-ethernet-cert-automated
     after-suspend-networking-cert-automated
     after-suspend-optical-cert-automated

diff --git a/providers/certification-client/units/client-cert-odm-desktop-20-04.pxu b/providers/certification-client/units/client-cert-odm-desktop-20-04.pxu
@@ -22,7 +22,7 @@ nested_part:
     keys-cert-manual
     led-cert-manual
     mediacard-cert-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -121,7 +121,7 @@ nested_part:
     keys-cert-automated
     led-cert-automated
     mediacard-cert-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -157,6 +157,7 @@ nested_part:
     # after-suspend-usb-cert-automated
     # after-suspend-usb3-cert-automated
     # after-suspend-usb-c-cert-automated # only usb-c-cert-full
+    after-suspend-wwan-automated
     after-suspend-wireless-cert-automated
     # Automated Tests
     # The following tests are purely automated and/or lenghty stress tests.

diff --git a/providers/certification-client/units/client-cert-odm-desktop-22-04.pxu b/providers/certification-client/units/client-cert-odm-desktop-22-04.pxu
@@ -22,7 +22,7 @@ nested_part:
     keys-cert-manual
     led-cert-manual
     mediacard-cert-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -122,7 +122,7 @@ nested_part:
     keys-cert-automated
     led-cert-automated
     mediacard-cert-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -158,6 +158,7 @@ nested_part:
     # after-suspend-usb-cert-automated
     # after-suspend-usb3-cert-automated
     # after-suspend-usb-c-cert-automated # only usb-c-cert-full
+    after-suspend-wwan-automated
     after-suspend-wireless-cert-automated
     # Automated Tests
     # The following tests are purely automated and/or lenghty stress tests.

diff --git a/providers/certification-client/units/client-cert-odm-desktop-24-04.pxu b/providers/certification-client/units/client-cert-odm-desktop-24-04.pxu
@@ -22,7 +22,7 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     mei-manual
-    mobilebroadband-cert-manual
+    wwan-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -118,7 +118,7 @@ nested_part:
     led-cert-automated
     mediacard-cert-automated
     mei-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -150,6 +150,7 @@ nested_part:
     # after-suspend-usb-cert-automated
     # after-suspend-usb3-cert-automated
     # after-suspend-usb-c-cert-automated # only usb-c-cert-full
+    after-suspend-wwan-automated
     after-suspend-wireless-cert-automated
     # Automated Tests
     # The following tests are purely automated and/or lenghty stress tests.