From 508de1f07147fa535e4e6c7b4c3c9cb5b8e4b0c7 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Fri, 6 Mar 2020 12:39:42 -0800 Subject: [PATCH] Address some policheck-ness - Skip scanning test logs (common source of issues) These can have generated names that contain violations - Address a policheck violation in our code --- azure-pipelines.yml | 3 ++- eng/PoliCheckExclusions.xml | 3 +++ src/Tye.Hosting/DockerRunner.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 eng/PoliCheckExclusions.xml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 60781a4d..793363ea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -182,4 +182,5 @@ stages: -TsaIterationPath $(_TsaIterationPath) -TsaRepositoryName "Tye" -TsaCodebaseName "Tye" - -TsaPublish $True' + -TsaPublish $True + -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml")' diff --git a/eng/PoliCheckExclusions.xml b/eng/PoliCheckExclusions.xml new file mode 100644 index 00000000..b5b68e0d --- /dev/null +++ b/eng/PoliCheckExclusions.xml @@ -0,0 +1,3 @@ + + LINUX_TEST_RESULTS|MACOS_TEST_RESULTS|WINDOWS_TEST_RESULTS|LINUX_TEST_LOGS|MACOS_TEST_LOGS|WINDOWS_TEST_LOGS + diff --git a/src/Tye.Hosting/DockerRunner.cs b/src/Tye.Hosting/DockerRunner.cs index 7ed19940..095dd069 100644 --- a/src/Tye.Hosting/DockerRunner.cs +++ b/src/Tye.Hosting/DockerRunner.cs @@ -162,7 +162,7 @@ namespace Tye.Hosting _logger.LogInformation("docker logs collection for {ContainerName} complete with exit code {ExitCode}", replica, result.ExitCode); - // Docker has a tendency to hang so we're going to timeout this shutdown process + // Docker has a tendency to get stuck so we're going to timeout this shutdown process var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5)); _logger.LogInformation("Stopping container {ContainerName} with ID {ContainerId}", replica, shortContainerId);