diff --git a/src/TesApi.Web/BatchScheduler.cs b/src/TesApi.Web/BatchScheduler.cs index 2e8aa5b1e..799d0e03b 100644 --- a/src/TesApi.Web/BatchScheduler.cs +++ b/src/TesApi.Web/BatchScheduler.cs @@ -1126,7 +1126,7 @@ private async Task ConvertTesTaskToBatchTaskAsync(string taskId, TesT sb.AppendLinuxLine($"chmod -R o+rwx $AZ_BATCH_TASK_WORKING_DIR/wd && \\"); sb.AppendLinuxLine($"export TES_TASK_WD=$AZ_BATCH_TASK_WORKING_DIR/wd && \\"); sb.AppendLinuxLine($"write_ts ExecutorStart && \\"); - sb.AppendLinuxLine($"docker run --rm {volumeMountsOption} --entrypoint= {workdirOption}{executor.Image} {executor.Command[0]} {string.Join(" ", executor.Command.Skip(1).Select(BashWrapShellArgument))} && \\"); + sb.AppendLinuxLine($"docker run --rm {volumeMountsOption} --entrypoint= {workdirOption}{executor.Image} {string.Join(" ", executor.Command.Select(BashWrapShellArgument))} && \\"); sb.AppendLinuxLine($"write_ts ExecutorEnd && \\"); sb.AppendLinuxLine($"write_ts UploadStart && \\"); sb.AppendLinuxLine($"./{NodeTaskRunnerFilename} upload && \\"); diff --git a/src/deploy-tes-on-azure/Deployer.cs b/src/deploy-tes-on-azure/Deployer.cs index 37546aae3..5be7cfc7c 100644 --- a/src/deploy-tes-on-azure/Deployer.cs +++ b/src/deploy-tes-on-azure/Deployer.cs @@ -714,7 +714,7 @@ private static async Task TestTaskAsync(string tesEndpoint, bool preemptibl new TesExecutor() { Image = "ubuntu:22.04", - Command = new List{"echo 'hello world'" }, + Command = new List{ "echo", "hello world" }, } }, Resources = new TesResources() diff --git a/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj b/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj index 6bdef9591..31199a19b 100644 --- a/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj +++ b/src/deploy-tes-on-azure/deploy-tes-on-azure.csproj @@ -64,8 +64,6 @@ - - PreserveNewest diff --git a/src/deploy-tes-on-azure/test.wdl b/src/deploy-tes-on-azure/test.wdl deleted file mode 100644 index 193630407..000000000 --- a/src/deploy-tes-on-azure/test.wdl +++ /dev/null @@ -1,21 +0,0 @@ -task hello { - String name - File inputFile - - command { - echo 'Hello ${name}!' - cat ${inputFile} > outfile2.txt - } - output { - File outfile1 = stdout() - File outfile2 = "outfile2.txt" - } - runtime { - docker: 'mcr.microsoft.com/mirror/docker/library/ubuntu:22.04' - preemptible: true - } -} - -workflow test { - call hello -} diff --git a/src/deploy-tes-on-azure/testInputs.json b/src/deploy-tes-on-azure/testInputs.json deleted file mode 100644 index a7e3058ea..000000000 --- a/src/deploy-tes-on-azure/testInputs.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "test.hello.name": "World", - "test.hello.inputFile": "{InputFilePath}" -}