fix: resolve merge conflicts from stu/fix_job_retry branch

The merge from stu/fix_job_retry incorrectly reverted the core change
where publishRetryMessage was moved to the end of the loop. This fix
restores the correct behavior:

- Restore queuedMessages.push(message) instead of await publishRetryMessage(message)
- Remove conflicting test assertions from merge (lines expecting both
  publishRetryMessage NOT to be called AND to be called 2 times)
- Reorder test assertions to check listEC2Runners before publishRetryMessage

All tests now pass with the correct behavior where publishRetryMessage
is called AFTER runner creation and only for non-rejected messages.

Co-authored-by: stuartp44 <1926002+stuartp44@users.noreply.github.com>

Author: Copilot

lambdas/functions/control-plane/src/scale-runners/scale-up.test.ts

@@ -1757,19 +1757,16 @@ describe('Retry mechanism tests', () => {
 
     await scaleUpModule.scaleUp(messages);
 
-    // publishRetryMessage should NOT be called because messages are marked as invalid
-    // Invalid messages go back to the SQS queue and will be retried there
-    expect(mockPublishRetryMessage).not.toHaveBeenCalled();
-
     // Verify listEC2Runners is called to check current runner count
     expect(listEC2Runners).toHaveBeenCalledWith({
       environment: 'unit-test-environment',
       runnerType: 'Org',
       runnerOwner: TEST_DATA_SINGLE.repositoryOwner,
     });
 
-    // publishRetryMessage should still be called even though no runners will be created
-    expect(mockPublishRetryMessage).toHaveBeenCalledTimes(2);
+    // publishRetryMessage should NOT be called because messages are marked as invalid
+    // Invalid messages go back to the SQS queue and will be retried there
+    expect(mockPublishRetryMessage).not.toHaveBeenCalled();
     expect(createRunner).not.toHaveBeenCalled();
   });
 

lambdas/functions/control-plane/src/scale-runners/scale-up.ts

@@ -358,7 +358,7 @@ export async function scaleUp(payloads: ActionRequestMessageSQS[]): Promise<stri
       }
 
       scaleUp++;
-      await publishRetryMessage(message);
+      queuedMessages.push(message);
     }
 
     if (scaleUp === 0) {