diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 93917e24e..7914605a0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,8 +15,7 @@ trigger: - master - branch-* -pool: - vmImage: 'windows-latest' +pool: .net-bubble-aws-re-team-prod variables: - group: sonarsource-build-variables @@ -79,8 +78,6 @@ stages: commonMavenArguments: -B -Pdeploy-sonarsource -Dmaven.test.skip=true steps: - checkout: self - - task: NuGetToolInstaller@1 - displayName: "Install NuGet" - task: CacheBeta@0 enabled: true displayName: Cache Maven local repo @@ -211,18 +208,6 @@ stages: nugetConfigPath: 'NuGet.Config' verbosityRestore: 'normal' # Default is noisy 'Detailed' - - task: DotNetCoreCLI@2 - displayName: Install CycloneDX - env: - ARTIFACTORY_USER: $(ARTIFACTORY_PRIVATE_READER_USERNAME) - ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PRIVATE_READER_ACCESS_TOKEN) - inputs: - command: custom - custom: tool - feedsToUse: 'select' - includeNuGetOrg: true - arguments: 'install --global CycloneDX' - - task: DotNetCoreCLI@2 displayName: Dotnet generate SBOM # https://sonarsource.atlassian.net/browse/BUILD-1303 @@ -543,7 +528,6 @@ stages: WINDOWSSDKTARGET: '10.0.17763.0' MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Xmx3072m -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' - pool: .net-bubble-aws-re-team-prod steps: - checkout: self fetchDepth: 1 @@ -566,10 +550,6 @@ stages: targetPath: '$(Build.SourcesDirectory)\build' artifactName: build - - task: NuGetToolInstaller@1 - inputs: - versionSpec: '5.8.0' - - task: PowerShell@2 displayName: "Get version from artifact file" inputs: