[minor] Move/change scheduler fvt to base pipeline

ibm-mas · Sep 26, 2024 · 6b2f803 · 6b2f803
1 parent 9f890b8
commit 6b2f803
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 44 deletions.
diff --git a/tekton/src/pipelines/taskdefs/fvt-manage-is/phase1.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-manage-is/phase1.yml.j2
@@ -3,8 +3,6 @@
 # - fvt-health-testng-preparedata  # Health
 #   - fvt-health-testng-desktop    # Health
 #   - fvt-health-python            # Health
-# - fvt-manage-scheduler-api       # Scheduler
-# - fvt-manage-scheduler-setup     # Scheduler
 # -----------------------------------------------------------------------------
 
 # Health
@@ -131,34 +129,6 @@
   runAfter:
     - fvt-health-testng-preparedata
 
-
-# Scheduler
-# -----------------------------------------------------------------------------
-# Scheduler - API Tests
-- name: fvt-manage-scheduler-api
-  {{ 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: scheduler-api
-  runAfter:
-    - fvt-manage-setup-is
-
-# Scheduler - UI Tests
-- name: fvt-manage-scheduler-setup
-  {{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/taskref.yml.j2') | indent(2) }}
-  {{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/when.yml.j2') | indent(2) }}
-  params:
-    {{ lookup('template', pipeline_src_dir ~ '/taskdefs/fvt-manage/ui/params.yml.j2') | indent(4) }}
-    - name: fvt_test_suite
-      value: scheduler-setup-data
-    - name: fvt_mas_appws_component
-      value: scheduler
-    - name: fvt_test_driver
-      value: tpae
-  runAfter:
-    - fvt-manage-setup-is
-
 # Minimum Verification Test for Operational Map Test Suites
 - name: fvt-manage-operationalmap-api
   {{ lookup('template', 'taskdefs/fvt-manage/api/taskref.yml.j2') | indent(2) }}

diff --git a/tekton/src/pipelines/taskdefs/fvt-manage-is/phase2.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-manage-is/phase2.yml.j2
@@ -20,8 +20,6 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
 
 # ACM - UI
 - name: fvt-manage-acm-ui
@@ -38,9 +36,6 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
-
 
 # HSE
 # -----------------------------------------------------------------------------
@@ -54,8 +49,6 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
 
 # HSE - UI
 - name: fvt-manage-hse-ui
@@ -72,9 +65,6 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
-
 
 # Service Provider
 # -----------------------------------------------------------------------------
@@ -88,8 +78,6 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
 
 # Service Provider - UI
 - name: fvt-manage-serviceprovider-ui
@@ -106,5 +94,3 @@
   runAfter:
     - fvt-health-testng-desktop
     - fvt-health-python
-    - fvt-manage-scheduler-api
-    - fvt-manage-scheduler-setup
diff --git a/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-manage/phase2.yml.j2
@@ -2,6 +2,7 @@
 # PHASE 2
 # - fvt-manage-base-api-system (pytest)
 # - fvt-manage-base-api-mif (pytest)
+# - fvt-manage-base-api-scheduler-qualification (pytest)
 # -------------------------------------------------------------
 
 # Manage FVT System
@@ -23,3 +24,13 @@
       value: base-api-mif
   runAfter:
     - fvt-manage-base-api-ivt
+
+# Manage Scheduler FVT - Qualification
+- name: fvt-manage-base-api-scheduler-qualification
+  {{ 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-api-scheduler-qualification
+  runAfter:
+    - fvt-manage-base-api-ivt
diff --git a/tekton/src/pipelines/taskdefs/fvt-manage/phase3.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-manage/phase3.yml.j2
@@ -19,6 +19,7 @@
   runAfter:
     - fvt-manage-base-api-system
     - fvt-manage-base-api-mif
+    - fvt-manage-base-api-scheduler-qualification
 
 # Manage FVT Help Links
 - name: fvt-manage-base-ui-helplinks
@@ -33,6 +34,7 @@
   runAfter:
     - fvt-manage-base-api-system
     - fvt-manage-base-api-mif
+    - fvt-manage-base-api-scheduler-qualification
 
 # Manage FVT Work Order Basic Scenario
 - name: fvt-manage-base-ui-wo-basic
@@ -47,6 +49,7 @@
   runAfter:
     - fvt-manage-base-api-system
     - fvt-manage-base-api-mif
+    - fvt-manage-base-api-scheduler-qualification
 
 # Manage FVT Mas Navigation Scenario
 - name: fvt-manage-base-ui-mas-navigation
@@ -61,3 +64,4 @@
   runAfter:
     - fvt-manage-base-api-system
     - fvt-manage-base-api-mif
+    - fvt-manage-base-api-scheduler-qualification