diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh deleted file mode 100755 index d0d1437c229c..000000000000 --- a/eng/install-scancode.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip - -# See latest release at https://github.com/nexB/scancode-toolkit/releases -SCANCODE_VERSION="32.4.1" - -pyEnvPath="/tmp/scancode-env" -python3 -m venv $pyEnvPath -source $pyEnvPath/bin/activate -pip install scancode-toolkit==$SCANCODE_VERSION -deactivate - -# Setup a script which executes scancode in the virtual environment -cat > /usr/local/bin/scancode << EOF -#!/bin/bash -set -euo pipefail -source $pyEnvPath/bin/activate -scancode "\$@" -deactivate -EOF - -chmod +x /usr/local/bin/scancode diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index bc360d9757fe..9cdf223ec69e 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -104,7 +104,7 @@ variables: - name: poolImage_Linux value: build.ubuntu.2204.amd64 - name: poolImage_LinuxArm64 - value: Mariner-2-Docker-ARM64 + value: Azure-Linux-3-Arm64 - name: poolName_LinuxArm64 value: Docker-Linux-Arm-Internal - name: poolImage_Mac diff --git a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml index e129e15cba48..adec454e51ed 100644 --- a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml @@ -75,6 +75,9 @@ jobs: - job: LicenseScan dependsOn: Setup + container: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-source-build-test-amd64 + options: '--memory=6g' pool: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals 1es-ubuntu-2204 @@ -83,23 +86,8 @@ jobs: matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ] steps: - - script: | - source ./eng/common/tools.sh - InitializeDotNetCli true - displayName: Install .NET SDK - workingDirectory: $(Build.SourcesDirectory) - - - task: PipAuthenticate@1 - displayName: 'Pip Authenticate' - inputs: - artifactFeeds: public/dotnet-public-pypi - onlyAddExtraIndex: false - - - script: $(sdkRoot)/eng/install-scancode.sh - displayName: Install Scancode - - script: > - $(Build.SourcesDirectory)/.dotnet/dotnet test + dotnet test $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --filter "FullyQualifiedName=Microsoft.DotNet.SourceBuild.SmokeTests.LicenseScanTests.ScanForLicenses" --logger:'trx;LogFileName=$(Agent.JobName)_LicenseScan.trx' diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 7c2f4d68e62e..6bbc84a83e59 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -136,7 +136,7 @@ public void ScanForLicenses() Assert.NotNull(Config.LicenseScanPath); // Indicates how long until a timeout occurs for scanning a given file - const int FileScanTimeoutSeconds = 300; + const int FileScanTimeoutSeconds = 1800; string scancodeResultsPath = Path.Combine(Config.LogsDirectory, "scancode-results.json");