[patch] Industry Solutions FVT keyword updates

tekton/src/params/fvt.yml.j2

@@ -174,6 +174,10 @@
   type: string
   description: FVT Digest - Mobile Inspection - Preparedata
   default: ""
+- name: fvt_digest_inspection_manage_setup
+  type: string
+  description: FVT Digest - Mobile Inspection - Manage Setup
+  default: ""
 - name: fvt_digest_inspection_testng
   type: string
   description: FVT Digest - Mobile Inspection - Testng

tekton/src/pipelines/taskdefs/fvt-apps/manage-industry-solutions.yml.j2

@@ -4,7 +4,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-acm-setup
+      value: acm-setup-data
     - name: fvt_mas_appws_component
       value: acm
     - name: fvt_test_driver
@@ -18,7 +18,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-acm-user
+      value: acm-setup-user
     - name: fvt_mas_appws_component
       value: acm
     - name: fvt_test_driver
@@ -32,7 +32,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-acm
+      value: acm-1
     - name: fvt_mas_appws_component
       value: acm
     - name: fvt_test_driver
@@ -46,7 +46,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-mfa-setup
+      value: mfa-setup
     - name: fvt_mas_appws_component
       value: aviation
     - name: fvt_test_driver
@@ -60,7 +60,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-mfa
+      value: mfa-1
     - name: fvt_mas_appws_component
       value: aviation
     - name: fvt_test_driver
@@ -74,7 +74,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: hse-setup
+      value: hse-setup-data
     - name: fvt_mas_appws_component
       value: hse
     - name: fvt_test_driver
@@ -88,7 +88,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-hse-user
+      value: hse-setup-user
     - name: fvt_mas_appws_component
       value: hse
     - name: fvt_test_driver
@@ -102,7 +102,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-hse
+      value: hse-1
     - name: fvt_mas_appws_component
       value: hse
     - name: fvt_test_driver
@@ -116,7 +116,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: nuc-setup
+      value: nuc-setup-data
     - name: fvt_mas_appws_component
       value: nuclear
     - name: fvt_test_driver
@@ -130,7 +130,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-nuc-user
+      value: nuc-setup-user
     - name: fvt_mas_appws_component
       value: nuclear
     - name: fvt_test_driver
@@ -144,7 +144,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-nuc
+      value: nuc-1
     - name: fvt_mas_appws_component
       value: nuclear
     - name: fvt_test_driver
@@ -158,7 +158,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-sp-setup
+      value: sp-setup-data
     - name: fvt_mas_appws_component
       value: serviceprovider
     - name: fvt_test_driver
@@ -172,7 +172,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-sp-user
+      value: sp-setup-user
     - name: fvt_mas_appws_component
       value: serviceprovider
     - name: fvt_test_driver
@@ -186,7 +186,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-sp
+      value: sp-1
     - name: fvt_mas_appws_component
       value: serviceprovider
     - name: fvt_test_driver
@@ -200,7 +200,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: lbs-setup
+      value: lbs-setup-data
     - name: fvt_mas_appws_component
       value: spatial
     - name: fvt_test_driver
@@ -214,7 +214,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: lbs-user
+      value: lbs-setup-user
     - name: fvt_mas_appws_component
       value: spatial
     - name: fvt_test_driver
@@ -228,7 +228,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-manage-spatial
+      value: lbs-spatial-1
     - name: fvt_mas_appws_component
       value: spatial
     - name: fvt_test_driver
@@ -242,7 +242,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-manage-utilities
+      value: lbs-utilities-1
     - name: fvt_mas_appws_component
       value: spatial
     - name: fvt_test_driver
@@ -256,7 +256,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-manage-linear
+      value: lbs-linear-1
     - name: fvt_mas_appws_component
       value: spatial
     - name: fvt_test_driver
@@ -270,7 +270,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-tr-setup
+      value: tr-setup-data
     - name: fvt_mas_appws_component
       value: transportation
     - name: fvt_test_driver
@@ -284,7 +284,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-tr-user
+      value: tr-setup-user
     - name: fvt_mas_appws_component
       value: transportation
     - name: fvt_test_driver
@@ -298,7 +298,7 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: fvt-tr
+      value: tr-1
     - name: fvt_mas_appws_component
       value: transportation
     - name: fvt_test_driver
@@ -376,55 +376,13 @@
   runAfter:
     - fvt-manage-scheduler-user
 
-# Manage FVT - Scheduler
-- name: fvt-manage-scheduler-4
-  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-manage.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
-    - name: fvt_test_suite
-      value: scheduler-4
-    - name: fvt_mas_appws_component
-      value: scheduler
-    - name: fvt_test_driver
-      value: tpae
-  runAfter:
-    - fvt-manage-scheduler-user
-
-# Manage FVT - Scheduler Graphite
-- name: fvt-manage-scheduler-graphite
-  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-manage.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
-    - name: fvt_test_suite
-      value: scheduler-graphite
-    - name: fvt_mas_appws_component
-      value: scheduler
-    - name: fvt_test_driver
-      value: graphite
-  runAfter:
-    - fvt-manage-scheduler-user
-
-# Manage FVT - Maintenance Manager
-- name: fvt-manage-maintmanager
-  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-manage.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
-    - name: fvt_test_suite
-      value: mm_bvt
-    - name: fvt_mas_appws_component
-      value: maintmanager
-    - name: fvt_test_driver
-      value: graphite
-  runAfter:
-    - fvt-manage-setup
-
 # Manage FVT - Health
 - name: fvt-manage-health
   {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-manage.yml.j2') | indent(2) }}
   params:
     {{ lookup('template', 'taskdefs/fvt-apps/common/params-manage.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: assetviewtable
+      value: health-asset-view-table
     - name: fvt_mas_appws_component
       value: health
     - name: fvt_test_driver

tekton/src/pipelines/taskdefs/fvt-apps/manage-regr.yml.j2

@@ -107,8 +107,6 @@
     - fvt-manage-scheduler-1
     - fvt-manage-scheduler-2
     - fvt-manage-scheduler-3
-    - fvt-manage-scheduler-4
-    - fvt-manage-scheduler-graphite
 
 # Manage FVT - Scheduler
 - name: fvt-manage-scheduler-6
@@ -125,8 +123,6 @@
     - fvt-manage-scheduler-1
     - fvt-manage-scheduler-2
     - fvt-manage-scheduler-3
-    - fvt-manage-scheduler-4
-    - fvt-manage-scheduler-graphite
 
 # Manage FVT - Scheduler
 - name: fvt-manage-scheduler-7
@@ -143,8 +139,6 @@
     - fvt-manage-scheduler-1
     - fvt-manage-scheduler-2
     - fvt-manage-scheduler-3
-    - fvt-manage-scheduler-4
-    - fvt-manage-scheduler-graphite
 
 # Service Provider FVT - Regression Lane 1 - Task 1
 - name: fvt-manage-sp-reg1-1

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

@@ -10,11 +10,11 @@
     - name: fvt_image_digest
       value: $(params.fvt_digest_mobilefoundation_manage_setup)
     - name: fvt_mas_appws_component
-      value: mobfound
+      value: mobile
     - name: mas_appws_components
       value: $(params.mas_appws_components)
     - name: fvt_test_suite
-      value: mxmobsetup # Keyword for Mobile FVT
+      value: platform-manage-setup # Keyword for Mobile FVT
   # Only if we've set a digest of the Manage Transportation FVT to run
   when:
     {{ lookup('template', 'taskdefs/fvt-apps/common/when-mobile.yml.j2') | indent(4) }}
@@ -116,9 +116,9 @@
     - name: fvt_image_digest
       value: $(params.fvt_digest_servicerequests_manage_setup)
     - name: fvt_test_suite
-      value: SR-setup
+      value: service-request-setup-data
     - name: fvt_mas_appws_component
-      value: mobsr
+      value: mobile
   # Only if we've set a digest of the Mobile Foundation FVT to run
   when:
     {{ lookup('template', 'taskdefs/fvt-apps/common/when-mobile.yml.j2') | indent(4) }}
@@ -262,6 +262,32 @@
   runAfter:
     - fvt-technician-testng-mas-android
 
+## Mobile Inspections Manage Setup
+- name: fvt-inspections-manage-setup
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-mobile-manage.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-mobile.yml.j2') | indent(4) }}
+    - name: fvt_image_namespace
+      value: fvt-inspections
+    - name: fvt_image_name
+      value: fvt-inspections-manage-setup
+    - name: fvt_image_digest
+      value: $(params.fvt_digest_inspection_manage_setup)
+    - name: fvt_mas_appws_component
+      value: mobile
+    - name: mas_appws_components
+      value: $(params.mas_appws_components)
+    - name: fvt_test_suite
+      value: inspections-setup-data # Keyword for Mobile FVT
+  # Only if we've set a digest of the Manage Transportation FVT to run
+  when:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/when-mobile.yml.j2') | indent(4) }}
+    - input: "$(params.fvt_digest_inspection_manage_setup)"
+      operator: notin
+      values: [""]
+  runAfter:
+    - fvt-manage-setup
+
 ## Prepare Data for Mobile Inspection MAS test suites
 - name: fvt-inspections-testng-preparedata
   {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-mobile-run-suite.yml.j2') | indent(2) }}
@@ -282,7 +308,7 @@
       operator: notin
       values: [""]
   runAfter:
-    - fvt-manage-setup
+    - fvt-inspections-manage-setup
 
 ## Minimum Verification Test for Mobile Inspection MAS test suites
 - name: fvt-inspections-testng-mas-android
@@ -510,11 +536,11 @@
     - name: fvt_image_digest
       value: $(params.fvt_digest_ic_manage_setup)
     - name: fvt_mas_appws_component
-      value: mobic
+      value: mobile
     - name: mas_appws_components
       value: $(params.mas_appws_components)
     - name: fvt_test_suite
-      value: setup4ic # Keyword for IC setup
+      value: inventory-counting-setup-data # Keyword for IC setup
   # Only if we've set a digest of the IC FVT to run
   when:
     {{ lookup('template', 'taskdefs/fvt-apps/common/when-mobile.yml.j2') | indent(4) }}