From aa38026e25c1a4559193a5b3aacdc8a531daca29 Mon Sep 17 00:00:00 2001
From: Unnati Solanki <unnati.solanki@ibm.com>
Date: Thu, 5 Sep 2024 12:11:32 +0530
Subject: [PATCH 1/2] [patch] moving user timeout in the end

---
 .../tasks/fvt/fvt-manage-last-phase.yml.j2    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tekton/src/tasks/fvt/fvt-manage-last-phase.yml.j2 b/tekton/src/tasks/fvt/fvt-manage-last-phase.yml.j2
index 7b9de82db8..e8332fc1f7 100644
--- a/tekton/src/tasks/fvt/fvt-manage-last-phase.yml.j2
+++ b/tekton/src/tasks/fvt/fvt-manage-last-phase.yml.j2
@@ -145,8 +145,8 @@ spec:
 
   steps:
 
-    # Manage FVT MAS UserTimeout
-    - name: fvt-manage-mas-usertimeout
+    # Manage FVT Application Designer
+    - name: fvt-manage-application-designer
       image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
       imagePullPolicy: $(params.image_pull_policy)
       timeout: 150m # Ensure bad FVTs don't run forever
@@ -158,10 +158,10 @@ spec:
           name: dshm
       env:
         - name: FVT_TEST_SUITE
-          value: masuser-timeout
+          value: application-designer
 
-    # Manage FVT Application Designer
-    - name: fvt-manage-application-designer
+    # Manage FVT Start Center
+    - name: fvt-manage-startcenter-config
       image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
       imagePullPolicy: $(params.image_pull_policy)
       timeout: 150m # Ensure bad FVTs don't run forever
@@ -173,10 +173,10 @@ spec:
           name: dshm
       env:
         - name: FVT_TEST_SUITE
-          value: application-designer
+          value: startcenter-config
 
-    # Manage FVT Start Center
-    - name: fvt-manage-startcenter-config
+    # Manage FVT Create Workflow Design & Approve WO Assignments
+    - name: fvt-manage-workflow-designer
       image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
       imagePullPolicy: $(params.image_pull_policy)
       timeout: 150m # Ensure bad FVTs don't run forever
@@ -188,10 +188,10 @@ spec:
           name: dshm
       env:
         - name: FVT_TEST_SUITE
-          value: startcenter-config
-
-    # Manage FVT Create Workflow Design & Approve WO Assignments
-    - name: fvt-manage-workflow-designer
+          value: workflow-designer
+    
+    # Manage FVT MAS UserTimeout
+    - name: fvt-manage-mas-usertimeout
       image: '$(params.fvt_image_registry)/fvt-manage/fvt-ibm-mas-manage@$(params.fvt_image_digest)'
       imagePullPolicy: $(params.image_pull_policy)
       timeout: 150m # Ensure bad FVTs don't run forever
@@ -203,4 +203,4 @@ spec:
           name: dshm
       env:
         - name: FVT_TEST_SUITE
-          value: workflow-designer
+          value: masuser-timeout

From a28ad3a84f3f29755c6f2e0bf8b7d28be189555f Mon Sep 17 00:00:00 2001
From: Unnati Solanki <unnati.solanki@ibm.com>
Date: Tue, 12 Nov 2024 00:29:53 +0530
Subject: [PATCH 2/2] [patch] adding playwright tests

---
 .../pipelines/taskdefs/fvt-manage/phase2.yml.j2   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2
index 589e049246..8cadf24086 100644
--- a/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2
+++ b/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2
@@ -1,7 +1,8 @@
 # -------------------------------------------------------------
 # PHASE 2
-# - fvt-manage-base-api-system (pytest)
-# - fvt-manage-base-api-mif (pytest)
+# - fvt-manage-base-api-system (pytest-api)
+# - fvt-manage-base-api-mif (pytest-api)
+# - fvt-manage-base-ui-system (pytest-ui)
 # -------------------------------------------------------------
 
 # Manage FVT System
@@ -23,3 +24,13 @@
       value: base-api-mif
   runAfter:
     - fvt-manage-base-api-ivt
+  
+# Manage Playwright UI tests
+- name: fvt-manage-base-ui-system
+  {{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/api/taskref.yml.j2') | indent(2) }}
+  params:
+    {{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/api/params.yml.j2') | indent(4) }}
+    - name: fvt_test_suite
+      value: base-ui-system
+  runAfter:
+    - fvt-manage-base-api-ivt