From 73caa2edb65ed2f7a738e95eb08d172870a16bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Fri, 11 Feb 2022 10:24:38 +0100 Subject: [PATCH] Revert "Revert "Fix warnings on Helix EOL queues" (#8452)" This reverts commit 3842fb5379515f8a31a399fe57a0d17002c1cfe9. --- azure-pipelines.yml | 6 ++++++ .../JobSender/JobDefinition.cs | 12 ++---------- src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf1757f335e..1fac68b9691 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -141,6 +141,7 @@ stages: -ci -restore -test + -warnAsError $false -projects $(Build.SourcesDirectory)\tests\UnitTests.proj /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Helix.binlog /p:RestoreUsingNuGetTargets=false @@ -170,6 +171,7 @@ stages: -ci -restore -test + -warnAsError $false -projects $(Build.SourcesDirectory)\tests\XHarness.Android.DeviceTests.proj /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Helix.XHarness.Android.Device.Tests.binlog /p:RestoreUsingNuGetTargets=false @@ -200,6 +202,7 @@ stages: --ci --restore --test + --warnAsError false --projects $(Build.SourcesDirectory)/tests/UnitTests.proj /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.binlog /p:RestoreUsingNuGetTargets=false @@ -230,6 +233,7 @@ stages: -ci -restore -test + -warnAsError false -projects $(Build.SourcesDirectory)/tests/XHarness.Apple.SimulatorTests.proj /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/XHarness.Apple.Simulator.Tests.binlog /p:RestoreUsingNuGetTargets=false @@ -260,6 +264,7 @@ stages: -ci -restore -test + -warnAsError false -projects $(Build.SourcesDirectory)/tests/XHarness.Apple.DeviceTests.proj /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.Apple.Device.Tests.binlog /p:RestoreUsingNuGetTargets=false @@ -290,6 +295,7 @@ stages: -ci -restore -test + -warnAsError false -projects $(Build.SourcesDirectory)/tests/XHarness.Android.SimulatorTests.proj /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.Android.Simulator.Tests.binlog /p:RestoreUsingNuGetTargets=false diff --git a/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs b/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs index e6ca7b2cc70..b5e4bee42c4 100644 --- a/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs +++ b/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs @@ -238,31 +238,23 @@ public async Task SendAsync(Action log, CancellationToken canc private void WarnForImpendingRemoval(Action log, QueueInfo queueInfo) { - bool azDoVariableDefined = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SYSTEM_TEAMPROJECT")); DateTime whenItExpires = DateTime.MaxValue; if (DateTime.TryParseExact(queueInfo.EstimatedRemovalDate, "yyyy-MM-dd", null, DateTimeStyles.AssumeUniversal, out DateTime dtIso)) { whenItExpires = dtIso; } - // This branch can be removed once the strings start coming in in ISO-8601 format - // Currently the API provides values in this format though and they are unlikely to get confused with each other. - else if (DateTime.TryParseExact(queueInfo.EstimatedRemovalDate, "M/d/yyyy", null, DateTimeStyles.AssumeUniversal, out DateTime dtUsa)) - { - whenItExpires = dtUsa; - } - if (whenItExpires != DateTime.MaxValue) // We recognized a date from the string { TimeSpan untilRemoved = whenItExpires.ToUniversalTime().Subtract(DateTime.UtcNow); if (untilRemoved.TotalDays <= 21) { - log?.Invoke($"{(azDoVariableDefined ? "##vso[task.logissue type=warning]" : "")}Helix queue {queueInfo.QueueId} {(untilRemoved.TotalDays < 0 ? "was" : "is")} slated for removal on {queueInfo.EstimatedRemovalDate}. Please discontinue usage. Contact dnceng for questions / concerns "); + log?.Invoke($"warning : Helix queue {queueInfo.QueueId} {(untilRemoved.TotalDays < 0 ? "was" : "is")} slated for removal on {queueInfo.EstimatedRemovalDate}. Please discontinue usage. Contact dnceng for questions / concerns "); } } else { - log?.Invoke($"{(azDoVariableDefined ? "##vso[task.logissue type=warning]" : "")}Unable to parse estimated removal date '{queueInfo.EstimatedRemovalDate}' for queue '{queueInfo.QueueId}' (please contact dnceng with this information)"); + log?.Invoke($"error : Unable to parse estimated removal date '{queueInfo.EstimatedRemovalDate}' for queue '{queueInfo.QueueId}' (please contact dnceng with this information)"); } } diff --git a/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs b/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs index abbf3ef3d80..a2abfe956a3 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs +++ b/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs @@ -262,9 +262,9 @@ protected override async Task ExecuteCore(CancellationToken cancellationToken) } Log.LogMessage(MessageImportance.High, $"Sending Job to {TargetQueue}..."); - cancellationToken.ThrowIfCancellationRequested(); - ISentJob job = await def.SendAsync(msg => Log.LogMessage(msg), cancellationToken); + // LogMessageFromText will take any string formatted as a canonical error or warning and convert the type of log to this + ISentJob job = await def.SendAsync(msg => Log.LogMessageFromText(msg, MessageImportance.High), cancellationToken); JobCorrelationId = job.CorrelationId; JobCancellationToken = job.HelixCancellationToken; ResultsContainerUri = job.ResultsContainerUri;