resiliency to existing git folder before clone - readded

dist/index.js

@@ -3683,6 +3683,7 @@ class KubernetesTaskRunner {
             let lastMessageSeenIncludedInChunk = false;
             let lastMessageSeen = false;
             // using this instead of Kube
+            try {
                 const logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName} -f -c ${containerName} --timestamps${sinceTime}`, false, true);
                 const splitLogs = logs.split(`\n`);
                 for (const chunk of splitLogs) {
@@ -3706,6 +3707,12 @@ class KubernetesTaskRunner {
                     KubernetesTaskRunner.lastReceivedTimestamp = newDate;
                     ({ shouldReadLogs, shouldCleanup, output } = follow_log_stream_service_1.FollowLogStreamService.handleIteration(message, shouldReadLogs, shouldCleanup, output));
                 }
+            }
+            catch (error) {
+                if (error.includes(`s`)) {
+                    break;
+                }
+            }
             if (!didStreamAnyLogs) {
                 core.error('Failed to stream any logs, listing namespace events, check for an error with the container');
                 core.error(JSON.stringify({
@@ -4160,17 +4167,18 @@ class RemoteClient {
     }
     static async cloneRepoWithoutLFSFiles() {
         process.chdir(`${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`);
-        if (build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)) {
+        if (node_fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute) &&
-            if (node_fs_1.default.existsSync(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))) {
+            !node_fs_1.default.existsSync(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))) {
+            await cloud_runner_system_1.CloudRunnerSystem.Run(`rm -r ${cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute}`);
+            cloud_runner_logger_1.default.log(`${cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute} repo exists, but no git folder, cleaning up`);
+        }
+        if (build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters) &&
+            node_fs_1.default.existsSync(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))) {
             process.chdir(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute);
             remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute} repo exists - skipping clone - retained workspace mode ${build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)}`);
             await cloud_runner_system_1.CloudRunnerSystem.Run(`git fetch && git reset --hard ${cloud_runner_1.default.buildParameters.gitSha}`);
             return;
         }
-            else {
-                cloud_runner_logger_1.default.log(`${cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute} repo exists, but no git folder, cleaning up`);
-            }
-        }
         remote_client_logger_1.RemoteClientLogger.log(`Initializing source repository for cloning with caching of LFS files`);
         await cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global advice.detachedHead false`);
         remote_client_logger_1.RemoteClientLogger.log(`Cloning the repository being built:`);

src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts

@@ -41,6 +41,7 @@ class KubernetesTaskRunner {
       let lastMessageSeen = false;
 
       // using this instead of Kube
+      try {
         const logs = await CloudRunnerSystem.Run(
           `kubectl logs ${podName} -f -c ${containerName} --timestamps${sinceTime}`,
           false,
@@ -75,6 +76,11 @@ class KubernetesTaskRunner {
             output,
           ));
         }
+      } catch (error: any) {
+        if (error.includes(`s`)) {
+          break;
+        }
+      }
 
       if (!didStreamAnyLogs) {
         core.error('Failed to stream any logs, listing namespace events, check for an error with the container');

src/model/cloud-runner/remote-client/index.ts

@@ -86,9 +86,18 @@ export class RemoteClient {
 
   private static async cloneRepoWithoutLFSFiles() {
     process.chdir(`${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`);
+    if (
+      fs.existsSync(CloudRunnerFolders.repoPathAbsolute) &&
+      !fs.existsSync(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`))
+    ) {
+      await CloudRunnerSystem.Run(`rm -r ${CloudRunnerFolders.repoPathAbsolute}`);
+      CloudRunnerLogger.log(`${CloudRunnerFolders.repoPathAbsolute} repo exists, but no git folder, cleaning up`);
+    }
 
-    if (BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)) {
+    if (
-      if (fs.existsSync(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`))) {
+      BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters) &&
+      fs.existsSync(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`))
+    ) {
       process.chdir(CloudRunnerFolders.repoPathAbsolute);
       RemoteClientLogger.log(
         `${
@@ -100,9 +109,6 @@ export class RemoteClient {
       await CloudRunnerSystem.Run(`git fetch && git reset --hard ${CloudRunner.buildParameters.gitSha}`);
 
       return;
-      } else {
-        CloudRunnerLogger.log(`${CloudRunnerFolders.repoPathAbsolute} repo exists, but no git folder, cleaning up`);
-      }
     }
 
     RemoteClientLogger.log(`Initializing source repository for cloning with caching of LFS files`);