Look at the current build for resubmit instead of the previous (#508)

Author: BradyShober

src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetAutoResubmitComputerLauncher.java

@@ -102,8 +102,17 @@ public void afterDisconnect(final SlaveComputer computer, final TaskListener lis
 
                     final List<Action> actions = new ArrayList<>();
                     if (task instanceof WorkflowJob) {
-                        final WorkflowRun lastUnsuccessfulBuild = ((WorkflowJob) task).getLastUnsuccessfulBuild();
-                        actions.addAll(lastUnsuccessfulBuild.getActions(ParametersAction.class));
+                        // Try to get the current running build first (which would be from the executable)
+                        WorkflowRun currentBuild = null;
+                        if (executable instanceof WorkflowRun) {
+                            currentBuild = (WorkflowRun) executable;
+                        } else {
+                            // Fallback to getting the last build (most recent)
+                            currentBuild = ((WorkflowJob) task).getLastBuild();
+                        }
+                        if (currentBuild != null) {
+                            actions.addAll(currentBuild.getActions(ParametersAction.class));
+                        }
                     }
                     if (executable instanceof Actionable) {
                         actions.addAll(((Actionable) executable).getAllActions());

src/test/java/com/amazon/jenkins/ec2fleet/EC2FleetAutoResubmitComputerLauncherTest.java

@@ -41,6 +41,21 @@
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 class EC2FleetAutoResubmitComputerLauncherTest {
+    @Test
+    void taskCompleted_should_resubmit_task_with_current_workflowrun_executable() {
+        // Setup: the current executable is a WorkflowRun, and the task is a WorkflowJob
+        when(executor1.getCurrentExecutable()).thenReturn(workflowRun);
+        when(workflowRun.getParent()).thenReturn(workflowJob);
+        when(workflowJob.getOwnerTask()).thenReturn(workflowJob);
+        when(workflowRun.getActions(any())).thenReturn(Collections.singletonList(action1));
+        when(computer.getExecutors()).thenReturn(Arrays.asList(executor1));
+
+        new EC2FleetAutoResubmitComputerLauncher(baseComputerLauncher)
+                .afterDisconnect(computer, taskListener);
+
+        verify(queue).schedule2(eq(workflowJob), anyInt(), eq(Arrays.asList(action1)));
+        verify(workflowRun, times(1)).getActions(any());
+    }
 
     private MockedStatic<Jenkins> mockedJenkins;
 
@@ -202,8 +217,8 @@ void taskCompleted_should_resubmit_task_with_actions() {
 
     @Test
     void taskCompleted_should_resubmit_task_with_build_actions() {
-        when(subTask1.getOwnerTask()).thenReturn(workflowJob);
-        when(workflowJob.getLastUnsuccessfulBuild()).thenReturn(workflowRun);
+    when(subTask1.getOwnerTask()).thenReturn(workflowJob);
+    when(workflowJob.getLastBuild()).thenReturn(workflowRun);
         when(workflowRun.getActions(any())).thenReturn((Collections.singletonList(action1)));
         when(computer.getExecutors()).thenReturn(Arrays.asList(executor1));
         new EC2FleetAutoResubmitComputerLauncher(baseComputerLauncher)