diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml similarity index 100% rename from eng/pipelines/source-build-sdk-diff-tests.yml rename to src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml similarity index 92% rename from eng/pipelines/templates/jobs/sdk-diff-tests.yml rename to src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml index bb202a338..617ad80f9 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -104,7 +104,7 @@ jobs: exit 1 fi - eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore + eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore echo "##vso[task.setvariable variable=Platform]$platform" echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" @@ -115,7 +115,7 @@ jobs: - script: > .dotnet/dotnet test - $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj + $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "Category=SdkContent" --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'console;verbosity=detailed' @@ -143,7 +143,6 @@ jobs: find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \; - cd "$(Build.SourcesDirectory)/src/SourceBuild/content" find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; @@ -164,7 +163,7 @@ jobs: inputs: testRunner: vSTest testResultsFiles: '*.trx' - searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults + searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults mergeTestResults: true publishRunAttachments: true testRunTitle: $(Agent.JobName) diff --git a/eng/pipelines/templates/steps/download-pipeline-artifact.yml b/src/SourceBuild/content/eng/pipelines/templates/steps/download-pipeline-artifact.yml similarity index 100% rename from eng/pipelines/templates/steps/download-pipeline-artifact.yml rename to src/SourceBuild/content/eng/pipelines/templates/steps/download-pipeline-artifact.yml diff --git a/eng/pipelines/templates/steps/download-vmr-artifact.yml b/src/SourceBuild/content/eng/pipelines/templates/steps/download-vmr-artifact.yml similarity index 100% rename from eng/pipelines/templates/steps/download-vmr-artifact.yml rename to src/SourceBuild/content/eng/pipelines/templates/steps/download-vmr-artifact.yml diff --git a/eng/pipelines/templates/variables/pipelines.yml b/src/SourceBuild/content/eng/pipelines/templates/variables/pipelines.yml similarity index 100% rename from eng/pipelines/templates/variables/pipelines.yml rename to src/SourceBuild/content/eng/pipelines/templates/variables/pipelines.yml diff --git a/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml similarity index 100% rename from eng/pipelines/vmr-license-scan.yml rename to src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml