Rename build_data dir to test-artifacts (#2618)

Co-authored-by: Rajkumar Rangaraj <rajrang@microsoft.com>
This commit is contained in:
Paulo Janotti 2023-06-08 15:21:06 -07:00 committed by GitHub
parent 5ab8818c56
commit dc39cd3992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions

View File

@ -237,7 +237,7 @@ jobs:
if: always()
with:
name: test-logs-${{ matrix.machine }}-${{ matrix.test-tfm }}-containers-${{ matrix.containers }}
path: build_data/
path: test-artifacts/
- name: Delete SQL Server MSI
if: ${{ runner.os == 'Windows' }}
shell: bash
@ -307,7 +307,7 @@ jobs:
if: always()
with:
name: test-logs-${{ matrix.machine }}-containers-${{ matrix.containers }}
path: build_data/
path: test-artifacts/
test-build-container:
needs: build-container

View File

@ -38,4 +38,4 @@ jobs:
if: always()
with:
name: logs-${{ matrix.machine }}
path: build_data/
path: test-artifacts/

4
.gitignore vendored
View File

@ -305,8 +305,8 @@ src/OpenTelemetry.AutoInstrumentation.Native/cmake_install.cmake
# ignore verify .received files
*.received.*
# profiler and test logs
/build_data
# ignore logs and test results
/test-artifacts
# install.sh downloaded artifacts
/otel-dotnet-auto/

View File

@ -25,8 +25,8 @@ partial class Build
AbsolutePath TestsDirectory => RootDirectory / "test";
AbsolutePath TracerHomeDirectory => TracerHome ?? (OutputDirectory / "tracer-home");
AbsolutePath BuildDataDirectory => RootDirectory / "build_data";
AbsolutePath ProfilerTestLogs => BuildDataDirectory / "profiler-logs";
AbsolutePath TestArtifactsDirectory => RootDirectory / "test-artifacts";
AbsolutePath ProfilerTestLogs => TestArtifactsDirectory / "profiler-logs";
AbsolutePath AdditionalDepsDirectory => TracerHomeDirectory / "AdditionalDeps";
AbsolutePath StoreDirectory => TracerHomeDirectory / "store";
@ -58,7 +58,7 @@ partial class Build
{
TracerHomeDirectory.CreateDirectory();
NuGetArtifactsDirectory.CreateDirectory();
BuildDataDirectory.CreateDirectory();
TestArtifactsDirectory.CreateDirectory();
ProfilerTestLogs.CreateDirectory();
});
@ -356,7 +356,7 @@ partial class Build
Target RunManagedTests => _ => _
.Unlisted()
.Produces(BuildDataDirectory / "profiler-logs" / "*")
.Produces(TestArtifactsDirectory / "profiler-logs" / "*")
.After(BuildTracer)
.After(CompileManagedTests)
.After(PublishMocks)
@ -615,7 +615,7 @@ partial class Build
.DependsOn(MarkdownLint)
.DependsOn(SpellcheckDocumentation);
private AbsolutePath GetResultsDirectory(Project proj) => BuildDataDirectory / "results" / proj.Name;
private AbsolutePath GetResultsDirectory(Project proj) => TestArtifactsDirectory / "results" / proj.Name;
/// <summary>
/// Bootstrapping tests require every single test to be run in a separate process

View File

@ -75,7 +75,7 @@ partial class Build : NukeBuild
NuGetArtifactsDirectory.CreateOrCleanDirectory();
(NativeProfilerProject.Directory / "build").CreateOrCleanDirectory();
(NativeProfilerProject.Directory / "deps").CreateOrCleanDirectory();
BuildDataDirectory.CreateOrCleanDirectory();
TestArtifactsDirectory.CreateOrCleanDirectory();
void DeleteReparsePoints(string path)
{

View File

@ -128,7 +128,7 @@ public class AspNetTests
string networkId = await DockerNetworkHelper.SetupIntegrationTestsNetworkAsync();
string logPath = EnvironmentHelper.IsRunningOnCI()
? Path.Combine(Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"), "build_data", "profiler-logs")
? Path.Combine(Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"), "test-artifacts", "profiler-logs")
: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), @"OpenTelemetry .NET AutoInstrumentation", "logs");
Directory.CreateDirectory(logPath);
Output.WriteLine("Collecting docker logs to: " + logPath);

View File

@ -278,7 +278,7 @@ public class EnvironmentHelper
CustomEnvironmentVariables["COR_PROFILER_PATH"] = profilerPath;
CustomEnvironmentVariables["OTEL_LOG_LEVEL"] = "debug";
CustomEnvironmentVariables["OTEL_DOTNET_AUTO_LOG_DIRECTORY"] = Path.Combine(EnvironmentTools.GetSolutionDirectory(), "build_data", "profiler-logs");
CustomEnvironmentVariables["OTEL_DOTNET_AUTO_LOG_DIRECTORY"] = Path.Combine(EnvironmentTools.GetSolutionDirectory(), "test-artifacts", "profiler-logs");
CustomEnvironmentVariables["OTEL_DOTNET_AUTO_HOME"] = GetNukeBuildOutput();
CustomEnvironmentVariables["OTEL_DOTNET_AUTO_TRACES_ADDITIONAL_SOURCES"] = "TestApplication.*";

View File

@ -76,7 +76,7 @@ public class WcfIISTests : TestHelper
var networkId = await DockerNetworkHelper.SetupIntegrationTestsNetworkAsync();
var logPath = EnvironmentHelper.IsRunningOnCI()
? Path.Combine(Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"), "build_data", "profiler-logs")
? Path.Combine(Environment.GetEnvironmentVariable("GITHUB_WORKSPACE"), "test-artifacts", "profiler-logs")
: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), @"OpenTelemetry .NET AutoInstrumentation", "logs");
Directory.CreateDirectory(logPath);