Skip to content

Commit 3e44f08

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#51698)
2 parents c5714d1 + aac3186 commit 3e44f08

File tree

4 files changed

+6
-43
lines changed

4 files changed

+6
-43
lines changed

eng/install-scancode.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ variables:
104104
- name: poolImage_Linux
105105
value: build.ubuntu.2204.amd64
106106
- name: poolImage_LinuxArm64
107-
value: Mariner-2-Docker-ARM64
107+
value: Azure-Linux-3-Arm64
108108
- name: poolName_LinuxArm64
109109
value: Docker-Linux-Arm-Internal
110110
- name: poolImage_Mac

src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575
7676
- job: LicenseScan
7777
dependsOn: Setup
78+
container:
79+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-source-build-test-amd64
80+
options: '--memory=6g'
7881
pool:
7982
name: NetCore1ESPool-Svc-Internal
8083
demands: ImageOverride -equals 1es-ubuntu-2204
@@ -83,23 +86,8 @@ jobs:
8386
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
8487
steps:
8588

86-
- script: |
87-
source ./eng/common/tools.sh
88-
InitializeDotNetCli true
89-
displayName: Install .NET SDK
90-
workingDirectory: $(Build.SourcesDirectory)
91-
92-
- task: PipAuthenticate@1
93-
displayName: 'Pip Authenticate'
94-
inputs:
95-
artifactFeeds: public/dotnet-public-pypi
96-
onlyAddExtraIndex: false
97-
98-
- script: $(sdkRoot)/eng/install-scancode.sh
99-
displayName: Install Scancode
100-
10189
- script: >
102-
$(Build.SourcesDirectory)/.dotnet/dotnet test
90+
dotnet test
10391
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
10492
--filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.LicenseScanTests.ScanForLicenses"
10593
--logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx'

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void ScanForLicenses()
136136
Assert.NotNull(Config.LicenseScanPath);
137137

138138
// Indicates how long until a timeout occurs for scanning a given file
139-
const int FileScanTimeoutSeconds = 300;
139+
const int FileScanTimeoutSeconds = 1800;
140140

141141
string scancodeResultsPath = Path.Combine(Config.LogsDirectory, "scancode-results.json");
142142

0 commit comments

Comments
 (0)