[patch] Adjustments to Mobile FVT Pipeline

tekton/src/pipelines/fvt-mobile.yml.j2

@@ -55,6 +55,7 @@ spec:
     # -------------------------------------------------------------------------
 
     {{ lookup('template', 'taskdefs/fvt-mobile/phase1-setup.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-mobile/phase1.4-pytest.yml.j2') | indent(4) }}
     {{ lookup('template', 'taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2') | indent(4) }}
     {{ lookup('template', 'taskdefs/fvt-mobile/phase2-android-part1.yml.j2') | indent(4) }}
     {{ lookup('template', 'taskdefs/fvt-mobile/phase3-android-part2.yml.j2') | indent(4) }}

tekton/src/pipelines/taskdefs/fvt-mobile/phase1-setup.yml.j2

@@ -30,33 +30,3 @@
     - input: "$(params.fvt_digest_mobile_pytest)"
       operator: notin
       values: [""]
-
-- name: fvt-mobile-test-sr
-  taskRef:
-    kind: Task
-    name: mas-fvt-mobile-pytest
-  workspaces:
-    - name: configs
-      workspace: shared-configs
-  params:
-    - name: fvt_image_registry
-      value: $(params.fvt_image_registry)
-    - name: fvt_image_digest
-      value: $(params.fvt_digest_mobile_pytest)
-    - name: fvt_test_suite
-      value: sr_api
-    - 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)
-  when:
-    - input: "$(params.mas_app_channel_manage)"
-      operator: notin
-      values: [""]
-    - input: "$(params.fvt_digest_mobile_pytest)"
-      operator: notin
-      values: [""]
-  runAfter:
-    - fvt-mobile-setup-data

tekton/src/pipelines/taskdefs/fvt-mobile/phase1.4-pytest.yml.j2

@@ -0,0 +1,89 @@
+- name: fvt-mobile-test-sr
+  taskRef:
+    kind: Task
+    name: mas-fvt-mobile-pytest
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+  params:
+    - name: fvt_image_registry
+      value: $(params.fvt_image_registry)
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_mobile_pytest)
+    - name: fvt_test_suite
+      value: mobile_api_sr
+    - 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)
+  when:
+    - input: "$(params.mas_app_channel_manage)"
+      operator: notin
+      values: [""]
+    - input: "$(params.fvt_digest_mobile_pytest)"
+      operator: notin
+      values: [""]
+  runAfter:
+    - fvt-mobile-setup-data
+
+- name: fvt-mobile-test-insp
+  taskRef:
+    kind: Task
+    name: mas-fvt-mobile-pytest
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+  params:
+    - name: fvt_image_registry
+      value: $(params.fvt_image_registry)
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_mobile_pytest)
+    - name: fvt_test_suite
+      value: mobile_api_insp
+    - 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)
+  when:
+    - input: "$(params.mas_app_channel_manage)"
+      operator: notin
+      values: [""]
+    - input: "$(params.fvt_digest_mobile_pytest)"
+      operator: notin
+      values: [""]
+  runAfter:
+    - fvt-mobile-test-sr
+
+- name: fvt-mobile-test-tech
+  taskRef:
+    kind: Task
+    name: mas-fvt-mobile-pytest
+  workspaces:
+    - name: configs
+      workspace: shared-configs
+  params:
+    - name: fvt_image_registry
+      value: $(params.fvt_image_registry)
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_mobile_pytest)
+    - name: fvt_test_suite
+      value: mobile_api_tech
+    - 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)
+  when:
+    - input: "$(params.mas_app_channel_manage)"
+      operator: notin
+      values: [""]
+    - input: "$(params.fvt_digest_mobile_pytest)"
+      operator: notin
+      values: [""]
+  runAfter:
+    - fvt-mobile-test-insp

tekton/src/pipelines/taskdefs/fvt-mobile/phase1.5-selenium-civil.yml.j2

@@ -6,7 +6,7 @@
     - name: fvt_test_suite
       value: civil-bvt
   runAfter:
-     - fvt-mobile-test-sr
+    - fvt-mobile-setup-data
 
 ## Minimum Verification Test for Mobile Defects MAS test suites
 - name: fvt-civil-defects-mvt-android

tekton/src/pipelines/taskdefs/fvt-mobile/phase2-android-part1.yml.j2

@@ -10,8 +10,7 @@
     - name: fvt_test_suite
       value: mobfoundation-mvt-android
   runAfter:
-    - fvt-mobile-test-sr
-
+    - fvt-mobile-setup-data
 ## Minimum Verification Test for Mobile Inspection MAS test suites
 - name: fvt-inspections-mvt-android
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref.yml.j2') | indent(2) }}
@@ -24,8 +23,7 @@
     - name: fvt_test_suite
       value: inspections-mvt-android
   runAfter:
-    - fvt-mobile-test-sr
-
+    - fvt-mobile-setup-data
 ## Minimum Verification Test for Mobile Asset Manager MAS test suites
 - name: fvt-asset-manager-mvt-android
   {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref.yml.j2') | indent(2) }}
@@ -38,7 +36,7 @@
     - name: fvt_test_suite
       value: asset-manager-mvt-android
   runAfter:
-    - fvt-mobile-test-sr
+    - fvt-mobile-setup-data
 
 ## Mobile FVT - Inventory Counting Android
 - name: fvt-inventorycounting-mvt-android
@@ -52,4 +50,4 @@
     - name: fvt_test_suite
       value: inventory-counting-mvt-android # xml for Mobile IC
   runAfter:
-    - fvt-mobile-test-sr
+    - fvt-mobile-setup-data