From 71e69d4d8f4f1402b3e4dea06ea7f00eb9a3a443 Mon Sep 17 00:00:00 2001
From: Andre Ferreira Guimaraes Junior <andrefgj@br.ibm.com>
Date: Tue, 21 Jul 2026 16:26:59 -0300
Subject: [PATCH 1/2] [patch] fix(pipeline): make
 fvt-optimizer-job-endpoints-ctf wait for both model-endpoints tasks

---
 tekton/src/pipelines/mas-fvt-optimizer.yml.j2 | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/tekton/src/pipelines/mas-fvt-optimizer.yml.j2 b/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
index 615e31ec6d..bbfeb7ed57 100644
--- a/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
+++ b/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
@@ -534,6 +534,46 @@ spec:
         - name: configs
           workspace: shared-configs
 
+    # 11.1 Run "api_model_endpoints"
+    # -----------------------------------------------------------------------------
+    - name: fvt-optimizer-model-endpoints
+      params:
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: fvt_image_registry
+          value: $(params.fvt_image_registry)
+        - name: fvt_image_namespace
+          value: fvt-manage
+        - name: fvt_image_name
+          value: fvt-ibm-mas-manage-pytest
+        - name: fvt_image_digest
+          value: $(params.fvt_digest_manage_pytest)
+        - name: product_channel
+          value: $(params.mas_app_channel_optimizer)
+        - name: product_id
+          value: ibm-mas-optimizer
+        - name: fvt_test_suite
+          value: api_model_endpoints
+      timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-fvt-manage-pytest
+      when:
+        - input: "$(params.fvt_digest_manage_pytest)"
+          operator: notin
+          values: [""]
+        - input: "$(params.mas_app_channel_manage)"
+          operator: notin
+          values: [""]
+        - input: "$(params.mas_app_channel_optimizer)"
+          operator: notin
+          values: [""]
+      workspaces:
+        - name: configs
+          workspace: shared-configs
+      runAfter:
+        - moprojects
+
     # 12. Run "api_job_endpoints" (CTF)
     # -----------------------------------------------------------------------------
     - name: fvt-optimizer-job-endpoints-ctf
@@ -571,6 +611,7 @@ spec:
           values: [""]
       runAfter:
         - fvt-optimizer-model-endpoints-ctf
+        - fvt-optimizer-model-endpoints
       workspaces:
         - name: configs
           workspace: shared-configs

From ae1694b356051b4b2c43ee79d0e3418fa302b331 Mon Sep 17 00:00:00 2001
From: Andre Ferreira Guimaraes Junior <andrefgj@br.ibm.com>
Date: Tue, 21 Jul 2026 18:19:19 -0300
Subject: [PATCH 2/2] [patch] fix(pipeline): fixing syntax type under runAfter
 block

---
 tekton/src/pipelines/mas-fvt-optimizer.yml.j2 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tekton/src/pipelines/mas-fvt-optimizer.yml.j2 b/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
index bbfeb7ed57..5e9c102c04 100644
--- a/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
+++ b/tekton/src/pipelines/mas-fvt-optimizer.yml.j2
@@ -572,7 +572,7 @@ spec:
         - name: configs
           workspace: shared-configs
       runAfter:
-        - moprojects
+        - fvt-optimizer-model-endpoints-ctf
 
     # 12. Run "api_job_endpoints" (CTF)
     # -----------------------------------------------------------------------------
@@ -610,7 +610,6 @@ spec:
           operator: notin
           values: [""]
       runAfter:
-        - fvt-optimizer-model-endpoints-ctf
         - fvt-optimizer-model-endpoints
       workspaces:
         - name: configs
@@ -695,7 +694,7 @@ spec:
         - name: configs
           workspace: shared-configs
       runAfter:
-        - moprojects
+        - fvt-optimizer-project-endpoints-ctf
 
     # 15. Run "optimizer-api-endpoints"
     # -----------------------------------------------------------------------------