Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert 7383 #7595

Merged
merged 4 commits into from
Jul 7, 2021
Merged

Revert 7383 #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b0c1a4
Update badge branch names
missymessa Mar 16, 2021
8251952
Merge branch 'main' of https://github.com/dotnet/arcade into main
missymessa Mar 23, 2021
55eff33
Merge branch 'main' of https://github.com/dotnet/arcade into main
missymessa Jul 7, 2021
73c9e8e
Revert "Use helix reporting (#7383)"
missymessa Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,3 @@ node_modules/
# Python Compile Outputs

*.pyc

# IntelliJ
.idea/

# vscode python env files
.env
5 changes: 0 additions & 5 deletions eng/test-configuration.json
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/HelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.IO;
using Xunit;
using System.Net;
using Newtonsoft.Json;

namespace Microsoft.DotNet.Helix.Sdk.Tests
{
Expand Down Expand Up @@ -38,18 +35,5 @@ public void VerifyNonEncodedFowardSlashIsConverted()

Assert.Equal(workItemNameExpected, actual);
}

[Fact]
public void FailOnceThenPass()
{
var target = Path.Combine(Path.GetTempPath(), "my-test-file-123456.snt");
bool exists = File.Exists(target);
if (!exists)
{
File.WriteAllText(target, "Test failed once");
}

Assert.True(exists, $"File should exist: {target}");
}
}
}
35 changes: 4 additions & 31 deletions src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Text;
using System.Threading;
Expand Down Expand Up @@ -34,7 +33,6 @@ public static class MetadataNames
public const string Uri = "Uri";
public const string Destination = "Destination";
public const string IncludeDirectoryName = "IncludeDirectoryName";
public const string AsArchive = "AsArchive";
}

/// <summary>
Expand Down Expand Up @@ -523,41 +521,16 @@ private IJobDefinition AddCorrelationPayload(IJobDefinition def, ITaskItem corre
if (Directory.Exists(path))
{
string includeDirectoryNameStr = correlationPayload.GetMetadata(MetadataNames.IncludeDirectoryName);
if (!bool.TryParse(includeDirectoryNameStr, out bool includeDirectoryName))
{
includeDirectoryName = false;
}
bool.TryParse(includeDirectoryNameStr, out bool includeDirectoryName);

Log.LogMessage(
MessageImportance.Low,
$"Adding Correlation Payload Directory '{path}', destination '{destination}'"
);
Log.LogMessage(MessageImportance.Low, $"Adding Correlation Payload Directory '{path}', destination '{destination}'");
return def.WithCorrelationPayloadDirectory(path, includeDirectoryName, destination);

}

if (File.Exists(path))
{
string asArchiveStr = correlationPayload.GetMetadata(MetadataNames.AsArchive);
if (!bool.TryParse(asArchiveStr, out bool asArchive))
{
asArchive = false;
}

if (asArchive)
{
Log.LogMessage(
MessageImportance.Low,
$"Adding Correlation Payload Archive '{path}', destination '{destination}'"
);
return def.WithCorrelationPayloadArchive(path, destination);
}

Log.LogMessage(
MessageImportance.Low,
$"Adding Correlation Payload File '{path}', destination '{destination}'"
);
return def.WithCorrelationPayloadFiles(path);
Log.LogMessage(MessageImportance.Low, $"Adding Correlation Payload Archive '{path}', destination '{destination}'");
return def.WithCorrelationPayloadArchive(path, destination);
}

Log.LogError(FailureCategory.Build, $"Correlation Payload '{path}' not found.");
Expand Down
10 changes: 1 addition & 9 deletions src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
<PropertyGroup>
<EnableXUnitReporter Condition=" '$(EnableXUnitReporter)' != 'true' ">false</EnableXUnitReporter>
</PropertyGroup>

<PropertyGroup Condition=" '$(HelixTestConfigurationFilePath)' == '' ">
<HelixTestConfigurationFilePath Condition=" '$(RepositoryEngineeringDir)' != '' ">$(RepositoryEngineeringDir)/test-configuration.json</HelixTestConfigurationFilePath>
</PropertyGroup>


<Choose>
<When Condition="$(HelixTargetQueue.ToLowerInvariant().Contains('windows'))">
<PropertyGroup>
Expand Down Expand Up @@ -40,10 +36,6 @@
<HelixProperties Condition="'$(HelixArchitecture)' != ''" Include="architecture" Value="$(HelixArchitecture)" />
<HelixProperties Include="operatingSystem" Value="$(HelixTargetQueue)" />
</ItemGroup>

<ItemGroup Condition="Exists('$(HelixTestConfigurationFilePath)')">
<HelixCorrelationPayload Include="$(HelixTestConfigurationFilePath)" AsArchive="false" />
</ItemGroup>

<Target Name="CoreBuild">
</Target>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.MonoQueue.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<PropertyGroup>
<HelixPostCommands Condition="$(IsPosixShell)">
$(HelixPostCommands);
$HELIX_PYTHONPATH $HELIX_CORRELATION_PAYLOAD/reporter/run.py $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit $?
/bin/sh $HELIX_CORRELATION_PAYLOAD/reporter/run.sh $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit $?
</HelixPostCommands>
<HelixPostCommands Condition="!$(IsPosixShell)">
$(HelixPostCommands);
%HELIX_PYTHONPATH% %HELIX_CORRELATION_PAYLOAD%\reporter\run.py $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit /b
call %HELIX_CORRELATION_PAYLOAD%\reporter\run.bat $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit /b
</HelixPostCommands>
</PropertyGroup>

Expand Down
Loading