rename
This commit is contained in:
parent
7071d06a0f
commit
522c032c92
2 changed files with 17 additions and 15 deletions
|
@ -14,7 +14,7 @@ pool:
|
|||
demands: ImageOverride -equals 1es-ubuntu-2004
|
||||
|
||||
parameters:
|
||||
- name: dotnetDotnetRunID
|
||||
- name: dotnetDotnetBuild
|
||||
displayName: 'Specific dotnet-dotnet run ID'
|
||||
type: string
|
||||
default: ' '
|
||||
|
@ -25,32 +25,32 @@ jobs:
|
|||
buildName: CentOSStream8_Offline
|
||||
targetRid: centos.8-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }}
|
||||
dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }}
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: CentOSStream9_Offline
|
||||
targetRid: centos.9-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }}
|
||||
dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }}
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: Fedora36_Offline
|
||||
targetRid: fedora.36-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }}
|
||||
dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }}
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: Ubuntu2004_Offline
|
||||
targetRid: ubuntu.2004-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }}
|
||||
dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }}
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: Debian11_Offline
|
||||
targetRid: debian.11-arm64
|
||||
architecture: arm64
|
||||
dotnetDotnetRunID: ${{ parameters.dotnetDotnetRunID }}
|
||||
dotnetDotnetBuild: ${{ parameters.dotnetDotnetBuild }}
|
||||
|
|
|
@ -8,7 +8,7 @@ parameters:
|
|||
- name: architecture
|
||||
type: string
|
||||
|
||||
- name: dotnetDotnetRunID
|
||||
- name: dotnetDotnetBuild
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
|
@ -21,8 +21,7 @@ jobs:
|
|||
- template: ../variables/pipelines.yml
|
||||
steps:
|
||||
- script: |
|
||||
vmr_build='${{ replace(parameters.dotnetDotnetRunID, ' ', '') }}'
|
||||
|
||||
vmr_build='${{ replace(parameters.dotnetDotnetBuild, ' ', '') }}'
|
||||
|
||||
if [[ -z "$vmr_build" ]]; then
|
||||
vmr_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(DOTNET_DOTNET_CI_PIPELINE_ID)' --status completed --top 1 --query "[].id" --output tsv)
|
||||
|
@ -47,7 +46,6 @@ jobs:
|
|||
echo "##vso[task.setvariable variable=InstallerBuildId]$installer_build"
|
||||
echo "##vso[task.setvariable variable=VmrBuildId]$vmr_build"
|
||||
displayName: Find associated builds
|
||||
|
||||
name: Get_Build_Ids
|
||||
env:
|
||||
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
|
||||
|
@ -85,16 +83,16 @@ jobs:
|
|||
- script: |
|
||||
set -x
|
||||
|
||||
msftSdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
|
||||
msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
|
||||
|
||||
if [[ -z $msftSdkTarballName ]]; then
|
||||
if [[ -z $msft_sdk_tarball_name ]]; then
|
||||
fail "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sdkTarballName=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;)
|
||||
sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-${{ parameters.targetRid }}.tar.gz" -exec basename {} \;)
|
||||
|
||||
if [[ -z $sdkTarballName ]]; then
|
||||
if [[ -z $sdk_tarball_name ]]; then
|
||||
fail "Source-build SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'"
|
||||
exit 1
|
||||
fi
|
||||
|
@ -104,7 +102,11 @@ jobs:
|
|||
envArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$msftSdkTarballName"
|
||||
envArgs+=" -e SMOKE_TESTS_SDK_TARBALL_PATH=$(Pipeline.Workspace)/Artifacts/$sdkTarballName"
|
||||
envArgs+=" -e SMOKE_TESTS_SOURCEBUILT_ARTIFACTS_PATH= "
|
||||
envArgs+=" -e SMOKE_TESTS_EXCLUDE_OMNISHARP=true -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} -e SMOKE_TESTS_PORTABLE_RID=linux-x64 -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= "
|
||||
envArgs+=" -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true"
|
||||
envArgs+=" -e SMOKE_TESTS_RUNNING_IN_CI=true"
|
||||
envArgs+=" -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }}"
|
||||
envArgs+=" -e SMOKE_TESTS_PORTABLE_RID=linux-x64"
|
||||
envArgs+=" -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= "
|
||||
|
||||
.dotnet/dotnet test $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.SdkContentTests.CompareMsftToSb" $envArgs --logger:'trx;LogFileName=$(Agent.JobName)_SDKComparisonTests.trx' --logger:'console;verbosity=detailed'
|
||||
displayName: Run Tests
|
||||
|
|
Loading…
Reference in a new issue