From f8d7bd4221c2bb760ddf794c32ef2723dfc1cdd9 Mon Sep 17 00:00:00 2001
From: Solar Mithril <solarmithril@pm.me>
Date: Fri, 21 Feb 2025 18:44:37 +0700
Subject: [PATCH 1/2] Fix sequencer and bootstrap issue

---
 src/el_cl_launcher.star | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/el_cl_launcher.star b/src/el_cl_launcher.star
index 6012751f..bf9b0126 100644
--- a/src/el_cl_launcher.star
+++ b/src/el_cl_launcher.star
@@ -266,6 +266,10 @@ def launch(
             interop_params,
         )
 
+        # We need to make sure that el_context and cl_context are first in the list, as down the line all_el_contexts[0]
+        # and all_cl_contexts[0] are used
+        all_el_contexts.insert(0, el_context)
+
         for metrics_info in [x for x in el_context.el_metrics_info if x != None]:
             observability.register_node_metrics_job(
                 observability_helper, el_context.client_name, "execution", metrics_info
@@ -285,6 +289,7 @@ def launch(
                     client_name="external-builder",
                 )
             else:
+                sequencer_context = all_el_contexts[0] if len(all_el_contexts) > 0 else None
                 el_builder_context = el_builder_launch_method(
                     plan,
                     el_builder_launcher,
@@ -295,7 +300,7 @@ def launch(
                     el_tolerations,
                     node_selectors,
                     all_el_contexts,
-                    sequencer_enabled,
+                    False, #sequencer_enabled
                     sequencer_context,
                     observability_helper,
                     interop_params,
@@ -349,6 +354,10 @@ def launch(
             da_server_context,
         )
 
+        # We need to make sure that el_context and cl_context are first in the list, as down the line all_el_contexts[0]
+        # and all_cl_contexts[0] are used
+        all_cl_contexts.insert(0, cl_context)
+
         for metrics_info in [x for x in cl_context.cl_nodes_metrics_info if x != None]:
             observability.register_node_metrics_job(
                 observability_helper,
@@ -393,10 +402,5 @@ def launch(
                 )
             all_cl_contexts.append(cl_builder_context)
 
-        # We need to make sure that el_context and cl_context are first in the list, as down the line all_el_contexts[0]
-        # and all_cl_contexts[0] are used
-        all_el_contexts.insert(0, el_context)
-        all_cl_contexts.insert(0, cl_context)
-
     plan.print("Successfully added {0} EL/CL participants".format(num_participants))
     return all_el_contexts, all_cl_contexts

From 719d0072ac49236c196382c83e0beb98c99be381 Mon Sep 17 00:00:00 2001
From: Solar Mithril <solarmithril@pm.me>
Date: Wed, 26 Feb 2025 11:06:27 +0700
Subject: [PATCH 2/2] Fix sequencer and bootstrap issue

---
 src/el_cl_launcher.star | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/el_cl_launcher.star b/src/el_cl_launcher.star
index bf9b0126..0a351be0 100644
--- a/src/el_cl_launcher.star
+++ b/src/el_cl_launcher.star
@@ -289,7 +289,9 @@ def launch(
                     client_name="external-builder",
                 )
             else:
-                sequencer_context = all_el_contexts[0] if len(all_el_contexts) > 0 else None
+                sequencer_context = (
+                    all_el_contexts[0] if len(all_el_contexts) > 0 else None
+                )
                 el_builder_context = el_builder_launch_method(
                     plan,
                     el_builder_launcher,
@@ -300,7 +302,7 @@ def launch(
                     el_tolerations,
                     node_selectors,
                     all_el_contexts,
-                    False, #sequencer_enabled
+                    False,  # sequencer_enabled
                     sequencer_context,
                     observability_helper,
                     interop_params,