Merge in 'release/6.0.1xx' changes
This commit is contained in:
commit
39a93ee8ca
2 changed files with 5 additions and 1 deletions
|
@ -146,7 +146,7 @@ jobs:
|
||||||
dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true"
|
dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=$(_ExcludeOmniSharpTests) -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=true"
|
||||||
poisonArg=''
|
poisonArg=''
|
||||||
|
|
||||||
if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then
|
if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then
|
||||||
dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts"
|
dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts"
|
||||||
msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
|
msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
|
||||||
dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName"
|
dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName"
|
||||||
|
|
|
@ -34,6 +34,8 @@ jobs:
|
||||||
architecture: x64
|
architecture: x64
|
||||||
condition: ${{ parameters.condition }}
|
condition: ${{ parameters.condition }}
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
|
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
|
excludeSdkContentTests: true
|
||||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||||
matrix:
|
matrix:
|
||||||
CentOS7-Online:
|
CentOS7-Online:
|
||||||
|
@ -86,6 +88,8 @@ jobs:
|
||||||
architecture: arm64
|
architecture: arm64
|
||||||
condition: ${{ parameters.condition }}
|
condition: ${{ parameters.condition }}
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
|
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
|
excludeSdkContentTests: true
|
||||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||||
matrix:
|
matrix:
|
||||||
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
|
|
Loading…
Reference in a new issue