Get starttask logs and fix start-task for docker configuration (#312)

Author: BMurri

src/TesApi.Tests/BatchSchedulerTests.cs

@@ -351,14 +351,22 @@ public async Task TesTaskRemainsQueuedWhenBatchQuotaIsTemporarilyUnavailable()
         [TestMethod]
         public async Task BatchTaskResourcesIncludeDownloadAndUploadScripts()
         {
+            var expectedFiles = new List<string>
+            {
+                "batch_script",
+                "TesTask.json",
+                "starttask_uploadlogs.json",
+                "tRunner",
+            };
+
             (_, var cloudTask, _, _) = await ProcessTesTaskAndGetBatchJobArgumentsAsync(true);
 
-            Assert.AreEqual(5, cloudTask.ResourceFiles.Count);
-            Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals("batch_script")));
-            Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals("upload_files_script")));
-            Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals("download_files_script")));
-            Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals("upload_metrics_script")));
-            Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals("tRunner")));
+            foreach (var file in expectedFiles)
+            {
+                Assert.IsTrue(cloudTask.ResourceFiles.Any(f => f.FilePath.Equals(file)));
+            }
+
+            Assert.AreEqual(expectedFiles.Count, cloudTask.ResourceFiles.Count);
         }
 
         private async Task AddBatchTaskHandlesExceptions(TesState newState, Func<AzureProxyReturnValues, (Action<IServiceCollection>, Action<Mock<IAzureProxy>>)> testArranger, Action<TesTask, IEnumerable<(LogLevel, Exception)>> resultValidator)
@@ -1678,15 +1686,15 @@ private static Action<Mock<IAzureProxy>> GetMockAzureProxy(AzureProxyReturnValue
                 var config = Enumerable.Empty<(string Key, string Value)>()
                 .Append(("Storage:DefaultAccountName", "defaultstorageaccount"))
                 .Append(("BatchScheduling:Prefix", "hostname"))
-                //.Append(("BatchImageGen1:Offer", "ubuntu-server-container"))
-                //.Append(("BatchImageGen1:Publisher", "microsoft-azure-batch"))
-                //.Append(("BatchImageGen1:Sku", "20-04-lts"))
-                //.Append(("BatchImageGen1:Version", "latest"))
+                .Append(("BatchImageGen1:Offer", "ubuntu-server-container"))
+                .Append(("BatchImageGen1:Publisher", "microsoft-azure-batch"))
+                .Append(("BatchImageGen1:Sku", "20-04-lts"))
+                .Append(("BatchImageGen1:Version", "latest"))
                 .Append(("BatchImageGen1:NodeAgentSkuId", "batch.node.ubuntu 20.04"))
-                //.Append(("BatchImageGen2:Offer", "ubuntu-hpc"))
-                //.Append(("BatchImageGen2:Publisher", "microsoft-dsvm"))
-                //.Append(("BatchImageGen2:Sku", "2004"))
-                //.Append(("BatchImageGen2:Version", "latest"))
+                .Append(("BatchImageGen2:Offer", "ubuntu-hpc"))
+                .Append(("BatchImageGen2:Publisher", "microsoft-dsvm"))
+                .Append(("BatchImageGen2:Sku", "2004"))
+                .Append(("BatchImageGen2:Version", "latest"))
                 .Append(("BatchImageGen2:NodeAgentSkuId", "batch.node.ubuntu 20.04"));
                 if (autopool)
                 {
@@ -1698,7 +1706,7 @@ private static Action<Mock<IAzureProxy>> GetMockAzureProxy(AzureProxyReturnValue
 
         private static IEnumerable<FileToDownload> GetFilesToDownload(Mock<IAzureProxy> azureProxy)
         {
-            var downloadFilesScriptContent = (string)azureProxy.Invocations.FirstOrDefault(i => i.Method.Name == nameof(IAzureProxy.UploadBlobAsync) && i.Arguments[0].ToString().Contains("/download_files_script"))?.Arguments[1];
+            var downloadFilesScriptContent = (string)azureProxy.Invocations.FirstOrDefault(i => i.Method.Name == nameof(IAzureProxy.UploadBlobAsync) && i.Arguments[0].ToString().Contains("/TesTask.json"))?.Arguments[1];
 
             if (string.IsNullOrEmpty(downloadFilesScriptContent))
             {