[patch] Remove Assist preparedata task and dependants (#116)

ibm-mas · Dec 15, 2022 · 5962409 · 5962409
1 parent 54de0d3
commit 5962409
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 232 deletions.
diff --git a/tekton/pipelines/fvt-assist.yaml b/tekton/pipelines/fvt-assist.yaml
@@ -595,121 +595,6 @@ spec:
 
     # 2. Application FVT - Assist
     # -------------------------------------------------------------------------
-    # Prepare data for Python and Desktop suites
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-testng-preparedata
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-preparedata
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-        - name: fvt_test_suite
-          value: prepare
-      runAfter:
-        - ivtcore-assist
-
-
-    # Python - Singleton
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-python
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-python
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-        - name: fvt_test_suite
-          value: unittest_pg_session
-      runAfter:
-        - fvt-assist-testng-preparedata
-
-
-    # Desktop Test Suite - Runs in sequence
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-testng-desktop
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist-desktop
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-testng
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-      runAfter:
-        - fvt-assist-testng-preparedata
-
-
     # Mobile Test Suite - Singleton
     # -----------------------------------------------------------------------------
     - name: fvt-assist-testng-mobile

diff --git a/tekton/pipelines/fvt-assist.yaml.j2 b/tekton/pipelines/fvt-assist.yaml.j2
@@ -41,4 +41,4 @@ spec:
 
     # 2. Application FVT - Assist
     # -------------------------------------------------------------------------
-    {{ lookup('template', 'taskdefs/fvt-apps/assist-multistep.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-apps/assist-multistep-no-preparedata.yml.j2') | indent(4) }}
diff --git a/tekton/pipelines/install-with-fvt.yaml b/tekton/pipelines/install-with-fvt.yaml
@@ -3380,121 +3380,6 @@ spec:
 
     # 17. Application FVT - Assist
     # -------------------------------------------------------------------------
-    # Prepare data for Python and Desktop suites
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-testng-preparedata
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-preparedata
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-        - name: fvt_test_suite
-          value: prepare
-      runAfter:
-        - ivtcore-assist
-
-
-    # Python - Singleton
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-python
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-python
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-        - name: fvt_test_suite
-          value: unittest_pg_session
-      runAfter:
-        - fvt-assist-testng-preparedata
-
-
-    # Desktop Test Suite - Runs in sequence
-    # -----------------------------------------------------------------------------
-    - name: fvt-assist-testng-desktop
-      taskRef:
-        kind: Task
-        name: mas-fvt-assist-desktop
-      when:
-        - input: "$(params.fvt_version_assist)"
-          operator: notin
-          values: [""]
-        - input: "$(params.mas_app_channel_assist)"
-          operator: notin
-          values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: devops_mongo_uri
-          value: $(params.devops_mongo_uri)
-        - name: devops_build_number
-          value: $(params.devops_build_number)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_name
-          value: fvt-assist-testng
-        - name: fvt_image_version
-          value: $(params.fvt_version_assist)
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-      runAfter:
-        - fvt-assist-testng-preparedata
-
-
     # Mobile Test Suite - Singleton
     # -----------------------------------------------------------------------------
     - name: fvt-assist-testng-mobile

diff --git a/tekton/pipelines/install-with-fvt.yaml.j2 b/tekton/pipelines/install-with-fvt.yaml.j2
@@ -360,7 +360,7 @@ spec:
 
     # 17. Application FVT - Assist
     # -------------------------------------------------------------------------
-    {{ lookup('template', 'taskdefs/fvt-apps/assist-multistep.yml.j2') | indent(4) }}
+    {{ lookup('template', 'taskdefs/fvt-apps/assist-multistep-no-preparedata.yml.j2') | indent(4) }}
 
 
     # 18. Application FVT - IoT

diff --git a/tekton/pipelines/taskdefs/fvt-apps/assist-multistep-no-preparedata.yml.j2 b/tekton/pipelines/taskdefs/fvt-apps/assist-multistep-no-preparedata.yml.j2
@@ -0,0 +1,89 @@
+# Mobile Test Suite - Singleton
+# -----------------------------------------------------------------------------
+- name: fvt-assist-testng-mobile
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-testng.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: testng-mobile-diagnosis
+    - name: assist_test_type
+      value: mobileapp
+    - name: assist_device_type
+      value: android
+  runAfter:
+    - ivtcore-assist
+
+
+# Cucumber - Run in parallel
+# -----------------------------------------------------------------------------
+- name: fvt-assist-cucumber
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: document_query
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-bayes
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: bayes
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-diagnosis
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: diagnosis
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-document-management
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: document_management
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-expertise
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: expertise
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-iot
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: iot
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-usage
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: usage
+  runAfter:
+    - ivtcore-assist
+
+- name: fvt-assist-cucumber-knowledge-extraction
+  {{ lookup('template', 'taskdefs/fvt-apps/common/taskref-assist.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', 'taskdefs/fvt-apps/common/params-assist-cucumber.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: knowledge-extraction
+  runAfter:
+    - ivtcore-assist