From 82f918399ac47ac3dac3e1d6f44ceee11ed31dee Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 28 Mar 2024 14:18:50 +0100 Subject: [PATCH 1/3] fixup parsing installer sha from vmr build tag --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index d7ed9a81a..40971fbdb 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -34,7 +34,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --query "[?contains(@, 'installer')]" --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" From 4443f5ed881f294a00546d2c8b78d14b02609af6 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 4 Apr 2024 16:36:08 +0200 Subject: [PATCH 2/3] move source-build pipelines to sb context folder --- .../content/eng}/pipelines/source-build-license-scan.yml | 0 .../content/eng}/pipelines/source-build-sdk-diff-tests.yml | 0 .../content/eng}/pipelines/templates/jobs/sdk-diff-tests.yml | 0 .../content/eng}/pipelines/templates/variables/pipelines.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {eng => src/SourceBuild/content/eng}/pipelines/source-build-license-scan.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/source-build-sdk-diff-tests.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/templates/jobs/sdk-diff-tests.yml (100%) rename {eng => src/SourceBuild/content/eng}/pipelines/templates/variables/pipelines.yml (100%) diff --git a/eng/pipelines/source-build-license-scan.yml b/src/SourceBuild/content/eng/pipelines/source-build-license-scan.yml similarity index 100% rename from eng/pipelines/source-build-license-scan.yml rename to src/SourceBuild/content/eng/pipelines/source-build-license-scan.yml 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 100% rename from eng/pipelines/templates/jobs/sdk-diff-tests.yml rename to src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.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 From c1fd9241db8e6495761f690896b8bb59a802680c Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Thu, 4 Apr 2024 16:45:21 +0200 Subject: [PATCH 3/3] fixup paths --- .../eng/pipelines/templates/jobs/sdk-diff-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 40971fbdb..52435dbc0 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -100,7 +100,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" @@ -110,7 +110,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' @@ -137,7 +137,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} \; @@ -158,7 +157,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)