diff --git a/src/TesApi.Web/BatchScheduler.cs b/src/TesApi.Web/BatchScheduler.cs index 5d7bb64ed..ec116155b 100644 --- a/src/TesApi.Web/BatchScheduler.cs +++ b/src/TesApi.Web/BatchScheduler.cs @@ -138,7 +138,6 @@ public BatchScheduler( _batchPoolFactory = poolFactory; batchPrefix = batchSchedulingOptions.Value.Prefix; logger.LogInformation("BatchPrefix: {BatchPrefix}", batchPrefix); - File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "scripts/task-run.sh")); this.runnerMD5 = File.ReadAllText(Path.Combine(AppContext.BaseDirectory, $"scripts/{NodeTaskRunnerMD5HashFilename}")).Trim(); this.gen2BatchNodeInfo = new BatchNodeInfo diff --git a/src/TesApi.Web/TesApi.Web.csproj b/src/TesApi.Web/TesApi.Web.csproj index 17dcf22d7..96804d4ec 100644 --- a/src/TesApi.Web/TesApi.Web.csproj +++ b/src/TesApi.Web/TesApi.Web.csproj @@ -49,15 +49,6 @@ - - - PreserveNewest - - - PreserveNewest - - - @@ -69,5 +60,11 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + diff --git a/src/TesApi.Web/scripts/clean-executor.sh b/src/TesApi.Web/scripts/clean-executor.sh deleted file mode 100644 index ea27000eb..000000000 --- a/src/TesApi.Web/scripts/clean-executor.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd "$(dirname "$0")" -if [ "$1" != "{TaskExecutor}" ]; then docker rmi {TaskExecutor} -f; fi || : -rm -fdr wd/{ExecutionPathPrefix} || : -sudo docker container prune -f || : -sudo docker system prune -a --volumes -f || : \ No newline at end of file diff --git a/src/TesApi.Web/scripts/task-run.sh b/src/TesApi.Web/scripts/task-run.sh deleted file mode 100644 index 9a1a66a17..000000000 --- a/src/TesApi.Web/scripts/task-run.sh +++ /dev/null @@ -1,9 +0,0 @@ -trap 'cleanup_task $?' ERR -cleanup_task() { - ../clean-executor.sh; exit $1 -} -{CleanupScriptLines} -chmod u+x ../clean-executor.sh -{GetBatchScriptFile} -/bin/sh {BatchScriptPath} -cleanup_task 0 \ No newline at end of file