diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml index 1506b9d5f54..aec3a82257a 100644 --- a/.azure-pipelines/common-templates/download-openapi-docs.yml +++ b/.azure-pipelines/common-templates/download-openapi-docs.yml @@ -8,11 +8,14 @@ parameters: - name: BaseBranch type: string default: "dev" + - name: BuildAgent + default: MsGraphBuildAgentsWindows + displayName: Build Agent jobs: - job: GetLatestDocs displayName: Download OpenApiDocs - pool: MsGraphDevXAzureAgents + pool: $(BuildAgent) steps: - template: ./checkout.yml diff --git a/.azure-pipelines/generate-auth-module-template.yml b/.azure-pipelines/generate-auth-module-template.yml index 51c36bb6355..0b92300335c 100644 --- a/.azure-pipelines/generate-auth-module-template.yml +++ b/.azure-pipelines/generate-auth-module-template.yml @@ -29,8 +29,7 @@ parameters: jobs: - job: MsGraphPSSDKAuthModuleGeneration displayName: Microsoft Graph PowerShell SDK Auth Module Generation - pool: MsGraphDevXAzureAgents - + steps: - template: ./install-tools-template.yml diff --git a/.azure-pipelines/generate-modules-template.yml b/.azure-pipelines/generate-modules-template.yml index 4438d612e71..de39096de2c 100644 --- a/.azure-pipelines/generate-modules-template.yml +++ b/.azure-pipelines/generate-modules-template.yml @@ -37,7 +37,6 @@ parameters: jobs: - job: MsGraphPSSDKServiceModulesGeneration displayName: Microsoft Graph PowerShell SDK Service Module Generation - pool: MsGraphDevXAzureAgents timeoutInMinutes: 600 steps: diff --git a/.azure-pipelines/generate-rollup-module-template.yml b/.azure-pipelines/generate-rollup-module-template.yml index 97634db1022..d09fb4532b7 100644 --- a/.azure-pipelines/generate-rollup-module-template.yml +++ b/.azure-pipelines/generate-rollup-module-template.yml @@ -33,7 +33,6 @@ parameters: jobs: - job: MsGraphPSSDKRollUpModuleGeneration displayName: Microsoft Graph PowerShell SDK Roll-Up Module Generation - pool: MsGraphDevXAzureAgents timeoutInMinutes: 600 steps: diff --git a/.azure-pipelines/generation-templates/generate-service-modules.yml b/.azure-pipelines/generation-templates/generate-service-modules.yml index e0386e99079..599dd804e30 100644 --- a/.azure-pipelines/generation-templates/generate-service-modules.yml +++ b/.azure-pipelines/generation-templates/generate-service-modules.yml @@ -20,10 +20,10 @@ parameters: - name: PublishToFeed type: boolean default: false + jobs: - job: GenerateServiceModules displayName: Service module generation - pool: MsGraphDevXAzureAgents timeoutInMinutes: 360 condition: and(succeeded(), ne(stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['OpenAPIDocDiff.ModulesWithChanges'], '')) variables: diff --git a/.azure-pipelines/install-tools-template.yml b/.azure-pipelines/install-tools-template.yml index 7bba77a0bba..f9e9b2ee677 100644 --- a/.azure-pipelines/install-tools-template.yml +++ b/.azure-pipelines/install-tools-template.yml @@ -14,6 +14,12 @@ steps: debugMode: false version: 3.x + - task: UseDotNet@2 + displayName: 'Use .NET Core SDK 5.x' + inputs: + debugMode: false + version: 5.x + - task: NuGetToolInstaller@1 displayName: 'Install Nuget 5.7' inputs: @@ -28,7 +34,6 @@ steps: targetType: inline script: | dotnet tool update --global PowerShell - pwsh - task: PowerShell@2 displayName: 'Version Check' diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml index 2aa5247707b..93fcf8488af 100644 --- a/.azure-pipelines/integrated-pipeline.yml +++ b/.azure-pipelines/integrated-pipeline.yml @@ -1,6 +1,19 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. +parameters: + - name: BuildAgent + default: MsGraphBuildAgentsWindows + displayName: Build Agent + + - name: AzureSubscription + default: "Microsoft Graph Build Agents (Win+Lin)" + displayName: Azure Subscription + + - name: KeyVault + default: "msgraph-build-keyvault" + displayName: Build Key vault + variables: AUTH_MODULE_NAME: 'Authentication' AUTH_MODULE_PATH: 'src\Authentication\Authentication' @@ -17,8 +30,11 @@ variables: GitUserEmail: 'GraphTooling@service.microsoft.com' GitUserName: 'Microsoft Graph DevX Tooling' BUILDNUMBER: -1 + BUILDAGENT: ${{ parameters.BuildAgent }} + AZURESUBSCRIPTION: ${{ parameters.AzureSubscription }} + KEYVAULT: ${{ parameters.KeyVault }} -pool: MsGraphDevXAzureAgents +pool: $(BUILDAGENT) trigger: branches: @@ -54,8 +70,8 @@ stages: steps: - task: AzureKeyVault@1 inputs: - azureSubscription: 'Microsoft Graph Build Agents' - KeyVaultName: 'msgraph-build-vault' + azureSubscription: $(AZURESUBSCRIPTION) + KeyVaultName: $(KEYVAULT) SecretsFilter: '*' RunAsPreJob: true diff --git a/.azure-pipelines/security-postchecks-template.yml b/.azure-pipelines/security-postchecks-template.yml index d56a156227f..2aa1538743d 100644 --- a/.azure-pipelines/security-postchecks-template.yml +++ b/.azure-pipelines/security-postchecks-template.yml @@ -4,9 +4,6 @@ jobs: - job: MsGraphPSSDKSecurityPostChecks displayName: Microsoft Graph PowerShell SDK Security Post Checks - pool: - image: windows-latest - timeoutInMinutes: 600 steps: - task: CodesignValidation@0 diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml index fad186e52d8..8dc2efd59ec 100644 --- a/.azure-pipelines/security-prechecks-template.yml +++ b/.azure-pipelines/security-prechecks-template.yml @@ -5,9 +5,7 @@ jobs: - job: MsGraphPSSDKSecurityPreChecks displayName: Microsoft Graph PowerShell SDK Security Pre Checks - pool: MsGraphDevXAzureAgents timeoutInMinutes: 600 - steps: - task: CredScan@2 displayName: 'Run CredScan' diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml index eb9951d2780..f6ef8293ca7 100644 --- a/.azure-pipelines/weekly-generation.yml +++ b/.azure-pipelines/weekly-generation.yml @@ -1,12 +1,21 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. + name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) -pool: MsGraphDevXAzureAgents + +parameters: + - name: BuildAgent + default: MsGraphBuildAgentsWindows + displayName: Build Agent variables: Branch: "WeeklyOpenApiDocsDownload" BaseBranch: "dev" + BUILDAGENT: ${{ parameters.BuildAgent }} + +pool: $(BUILDAGENT) + trigger: none pr: none schedules: