[patch] MAXMOA-6189 / MAXMOA-5844 - Mobile pipeline updates and new t…

…ests (#1466)
ibm-mas · Feb 17, 2025 · 2f54800 · 2f54800
1 parent 6d646ef
commit 2f54800
Show file tree

Hide file tree

Showing 16 changed files with 370 additions and 335 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @durera @JonahLuckett @andrercm @sanjayprab @terenceq @whitfiea @alequint @leo-miran
+* @durera @JonahLuckett @andrercm @sanjayprab @terenceq @whitfiea @alequint
diff --git a/tekton/src/pipelines/fvt-mobile-testng.yml.j2 b/tekton/src/pipelines/fvt-mobile-testng.yml.j2
@@ -59,5 +59,10 @@ spec:
     {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase2-civil.yml.j2') | indent(4) }}
     {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2') | indent(4) }}
     {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2') | indent(4) }}
-    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase5-apps-ios.yml.j2') | indent(4) }}
-    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase6-apps-desktop.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase11-final.yml.j2') | indent(4) }}
diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase1-setup.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase1-setup.yml.j2
@@ -1,8 +1,9 @@
 ## Mobile Foundation Manage Setup
-- name: fvt-mobile-setup-testng
+- name: fvt-mob-setup-testng
   taskRef:
     kind: Task
     name: mas-fvt-mobile-pytest
+  timeout: "0"
   workspaces:
     - name: configs
       workspace: shared-configs
@@ -32,11 +33,41 @@
       values: [""]
 
 ## Verification for Mobile JSON Schema
-- name: fvt-mobile-jsonschema
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-pytest.yml.j2') | indent(2) }}
+- name: fvt-mob-schema-pre
+  taskRef:
+    kind: Task
+    name: mas-fvt-mobile-pytest
+  timeout: "0"
   params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-pytest.yml.j2') | indent(4) }}
+    - name: fvt_image_registry
+      value: $(params.fvt_image_registry)
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_mobile_pytest)
+    - name: mas_instance_id
+      value: $(params.mas_instance_id)
+    - name: mas_workspace_id
+      value: $(params.mas_workspace_id)
+    - name: product_channel
+      value: $(params.mas_app_channel_manage)
+    - name: fvt_test_suite_suffix
+      value: pre
     - name: fvt_test_suite
-      value: mobile-api-jsonschema
+      value: mobile-api-mobile-schema
+    - name: input_data_file
+      value: "MobileSetup4MAS.data"
+    - name: output_data_file
+      value: "MobileSetup4MAS.data"
+    - name: enable_perf_debug
+      value: "True"
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+  when:
+    - input: "$(params.mas_app_channel_manage)"
+      operator: notin
+      values: [""]
+    - input: "$(params.fvt_digest_mobile_pytest)"
+      operator: notin
+      values: [""]
   runAfter:
-    - fvt-mobile-setup-testng
+    - fvt-mob-setup-testng
diff --git a/...-mobile/testng/phase6-apps-desktop.yml.j2 → ...mobile/testng/phase10-apps-desktop.yml.j2 b/...-mobile/testng/phase6-apps-desktop.yml.j2 → ...mobile/testng/phase10-apps-desktop.yml.j2
@@ -1,4 +1,5 @@
-- name: fvt-mobile-testng-ic-desktop
+# inventory counting desktop tasks
+- name: fvt-mob-desktop-ic
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -9,17 +10,12 @@
     - name: fvt_test_suite
       value: inventory-counting-mvt-desktop
   runAfter:
-    - fvt-mobile-testng-assetmng-ios
-    - fvt-mobile-testng-calibration-ios
-    - fvt-mobile-testng-inspections-ios
-    - fvt-mobile-testng-ic-ios
-    - fvt-mobile-testng-ir-ios
-    - fvt-mobile-testng-it-ios
-    - fvt-mobile-testng-sr-ios
-    - fvt-mobile-testng-supervisor-ios
-    - fvt-mobile-testng-technician-ios
+    - fvt-mob-ios-supervisor
+    - fvt-mob-ios-calibration
+    - fvt-mob-ios-it
 
-- name: fvt-mobile-testng-inspforms-desktop
+# inspections form desktop tasks
+- name: fvt-mob-desktop-inspforms
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -30,12 +26,6 @@
     - name: fvt_test_suite
       value: inspection-forms-mvt-desktop
   runAfter:
-    - fvt-mobile-testng-assetmng-ios
-    - fvt-mobile-testng-calibration-ios
-    - fvt-mobile-testng-inspections-ios
-    - fvt-mobile-testng-ic-ios
-    - fvt-mobile-testng-ir-ios
-    - fvt-mobile-testng-it-ios
-    - fvt-mobile-testng-sr-ios
-    - fvt-mobile-testng-supervisor-ios
-    - fvt-mobile-testng-technician-ios
+    - fvt-mob-ios-supervisor
+    - fvt-mob-ios-calibration
+    - fvt-mob-ios-it
diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase11-final.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase11-final.yml.j2
@@ -0,0 +1,39 @@
+## Verification for Mobile JSON Schema
+- name: fvt-mob-schema-post
+  taskRef:
+    kind: Task
+    name: mas-fvt-mobile-pytest
+  timeout: "0"
+  params:
+    - name: fvt_image_registry
+      value: $(params.fvt_image_registry)
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_mobile_pytest)
+    - name: mas_instance_id
+      value: $(params.mas_instance_id)
+    - name: mas_workspace_id
+      value: $(params.mas_workspace_id)
+    - name: product_channel
+      value: $(params.mas_app_channel_manage)
+    - name: fvt_test_suite_suffix
+      value: post
+    - name: fvt_test_suite
+      value: mobile-api-mobile-schema
+    - name: input_data_file
+      value: "MobileSetup4MAS.data"
+    - name: enable_perf_debug
+      value: "True"
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+  when:
+    - input: "$(params.mas_app_channel_manage)"
+      operator: notin
+      values: [""]
+    - input: "$(params.fvt_digest_mobile_pytest)"
+      operator: notin
+      values: [""]
+  runAfter:
+    - fvt-mob-desktop-ic
+    - fvt-mob-desktop-inspforms
+    - fvt-mob-ios-defects
diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2
@@ -6,10 +6,10 @@
     - name: fvt_test_suite
       value: civil-bvt
   runAfter:
-    - fvt-mobile-jsonschema
+    - fvt-mob-schema-pre
 
 ## Minimum Verification Test for Mobile Defects MAS test suites
-- name: fvt-mobile-testng-defects-android
+- name: fvt-mob-android-defects
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -23,7 +23,7 @@
     - fvt-manage-selenium-civil
 
 # Minimum Verification Test for Mobile Defects MAS test suites
-- name: fvt-mobile-testng-defects-ios
+- name: fvt-mob-ios-defects
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -34,4 +34,4 @@
     - name: fvt_test_suite
       value: civil-defects-mvt-ios
   runAfter:
-    - fvt-mobile-testng-defects-android
+    - fvt-mob-android-defects
diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2
@@ -1,5 +1,5 @@
 ## All Mobile Foundation MAS test suites
-- name: fvt-mobile-testng-mobfound-android
+- name: fvt-mob-android-mobfound
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -10,11 +10,10 @@
     - name: fvt_test_suite
       value: mobfoundation-mvt-android
   runAfter:
-    - fvt-mobile-jsonschema
-
+    - fvt-mob-schema-pre
 
 ## Minimum Verification Test for Mobile Foundation MAS test suites
-- name: fvt-mobile-testng-mobfound-ios
+- name: fvt-mob-ios-mobfound
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -25,5 +24,4 @@
     - name: fvt_test_suite
       value: mobfoundation-mvt-ios
   runAfter:
-    - fvt-mobile-jsonschema
-
+    - fvt-mob-schema-pre
diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2
@@ -1,5 +1,5 @@
 ## Minimum Verification Test for Mobile Inspection MAS test suites
-- name: fvt-mobile-testng-inspections-android
+- name: fvt-mob-android-inspections
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -10,11 +10,11 @@
     - name: fvt_test_suite
       value: inspections-mvt-android
   runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
+    - fvt-mob-android-mobfound
+    - fvt-mob-ios-mobfound
 
 ## Minimum Verification Test for Mobile Asset Manager MAS test suites
-- name: fvt-mobile-testng-assetmng-android
+- name: fvt-mob-android-assetmng
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -25,11 +25,11 @@
     - name: fvt_test_suite
       value: asset-manager-mvt-android
   runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
+    - fvt-mob-android-mobfound
+    - fvt-mob-ios-mobfound
 
 ## Mobile FVT - Inventory Counting Android
-- name: fvt-mobile-testng-ic-android
+- name: fvt-mob-android-ic
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
@@ -40,95 +40,5 @@
     - name: fvt_test_suite
       value: inventory-counting-mvt-android
   runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Minimum Verification Test for Mobile Service Request MAS test suites
-- name: fvt-mobile-testng-sr-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: service-request-app
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: service-request-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Mobile FVT - Inventory Receiving Android
-- name: fvt-mobile-testng-ir-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: ir-automation-testcases
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: inventory-receiving-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Minimum Verification Test for Mobile Technician MAS test suites
-- name: fvt-mobile-testng-technician-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: technician-app
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: technician-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Minimum Verification Test for Mobile Supervisor MAS test suites
-- name: fvt-mobile-testng-supervisor-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: supervisor-app
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: supervisor-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Minimum Verification Test for Mobile calibration MAS test suites
-- name: fvt-mobile-testng-calibration-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: calibration-app
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: calibration-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
-
-## Mobile FVT - Issues and Transfers Android
-- name: fvt-mobile-testng-it-android
-  {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }}
-    - name: fvt_mobile_app
-      value: it-automation-testcases
-    - name: mobile_device_type
-      value: android
-    - name: fvt_test_suite
-      value: issues-transfer-mvt-android
-  runAfter:
-    - fvt-mobile-testng-mobfound-android
-    - fvt-mobile-testng-mobfound-ios
+    - fvt-mob-android-mobfound
+    - fvt-mob-ios-mobfound
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @durera @JonahLuckett @andrercm @sanjayprab @terenceq @whitfiea @alequint @leo-miran
		* @durera @JonahLuckett @andrercm @sanjayprab @terenceq @whitfiea @alequint