Skip to content

Commit

Permalink
azure-pipelines: Change our AzDevOps to use the Linux pool (#1872)
Browse files Browse the repository at this point in the history
* Use Ubuntu image for VM

* Change the actual VM this time

* Add it to the build stage pipeline instead

* Change the name maybe

* Add input

* Add ConnectedServiceName parameter

* Stupid mistake

* Try adding it as a mb input

* Who knows

* Try changing pool in esmain

* Revert some stuff

* Add azureSub to mb

* Add azureSub under signing

* Indent signing

* Add azureSubscription to mb:

* Add azureSubscription to mb:

* Flip the slash

* Flip the slash pt. 2

* Update ubuntu to 24.04

* Revert to 22.04

* Revert some unwanted changes

* Flip the slashes for credscan

* Add comments as to why we need to keep the windows pool defined
  • Loading branch information
nturinski authored Jan 21, 2025
1 parent 4b8558a commit 4ab6989
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .azure-pipelines/1esmain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ extends:
parameters:
sdl:
credscan:
suppressionsFile: $(Build.SourcesDirectory)\.azure-pipelines\compliance\CredScanSuppressions.json
suppressionsFile: $(Build.SourcesDirectory)/.azure-pipelines/compliance/CredScanSuppressions.json
componentgovernance:
ignoreDirectories: $(Build.SourcesDirectory)\appservice\.vscode-test,$(Build.SourcesDirectory)\appsettings\.vscode-test,$(Build.SourcesDirectory)\auth\.vscode-test,$(Build.SourcesDirectory)\azure\.vscode-test,$(Build.SourcesDirectory)\dev\.vscode-test,$(Build.SourcesDirectory)\eslint-config-azuretools\.vscode-test,$(Build.SourcesDirectory)\github\.vscode-test,$(Build.SourcesDirectory)\serviceconnector\.vscode-test,$(Build.SourcesDirectory)\utils\.vscode-test
ignoreDirectories: $(Build.SourcesDirectory)/appservice/.vscode-test,$(Build.SourcesDirectory)/appsettings/.vscode-test,$(Build.SourcesDirectory)/auth/.vscode-test,$(Build.SourcesDirectory)/azure/.vscode-test,$(Build.SourcesDirectory)/dev/.vscode-test,$(Build.SourcesDirectory)/eslint-config-azuretools/.vscode-test,$(Build.SourcesDirectory)/github/.vscode-test,$(Build.SourcesDirectory)/serviceconnector/.vscode-test,$(Build.SourcesDirectory)/utils/.vscode-test
codeql:
excludePathPatterns: "**/.vscode-test, dist" # Exclude .vscode-test and dist directories from CodeQL alerting
# We need to keep this pool defined because SDLSources stage requires us to specify a windows pool
pool:
name: VSEngSS-MicroBuild2022-1ES # Name of your hosted pool
image: server2022-microbuildVS2022-1es # Name of the image in your pool. If not specified, first image of the pool is used
Expand Down
9 changes: 5 additions & 4 deletions azure-pipelines/1esmain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@ extends:
${{ if eq(parameters.IsOfficialBuild, true) }}:
tsa:
enabled: true
configFile: '$(Build.SourcesDirectory)\.azure-pipelines\compliance\tsaoptions.json'
configFile: '$(Build.SourcesDirectory)/.azure-pipelines/compliance/tsaoptions.json'
suppression:
suppressionFile: $(Build.SourcesDirectory)\.config\guardian\.gdnsuppress
suppressionFile: $(Build.SourcesDirectory)/.config/guardian/.gdnsuppress
credscan:
suppressionsFile: $(Build.SourcesDirectory)\.azure-pipelines\compliance\CredScanSuppressions.json
suppressionsFile: $(Build.SourcesDirectory)/.azure-pipelines/compliance/CredScanSuppressions.json
componentgovernance:
ignoreDirectories: $(Build.SourcesDirectory)\.vscode-test
ignoreDirectories: $(Build.SourcesDirectory)/.vscode-test
codeql:
excludePathPatterns: "**/.vscode-test, dist" # Exclude .vscode-test and dist directories from CodeQL alerting
# enabled: true # TODO: would like to enable only on scheduled builds but CodeQL cannot currently be disabled per https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/1es-codeql
# We need to keep this pool SDLSources stage requires us to specify a windows pool
pool:
name: VSEngSS-MicroBuild2022-1ES # Name of your hosted pool
image: server2022-microbuildVS2022-1es # Name of the image in your pool. If not specified, first image of the pool is used
Expand Down
5 changes: 5 additions & 0 deletions azure-pipelines/1esstages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ parameters:

stages:
- stage: BuildStage
pool:
name: AzurePipelines-EO
image: 1ESPT-Ubuntu22.04
os: linux
jobs:
- ${{ each job in parameters.jobs }}:
- job: ${{ job.name }}
Expand All @@ -28,6 +32,7 @@ stages:
enabled: ${{ parameters.enableSigning }}
signType: real # options are 'real' & 'test'
zipSources: false
azureSubscription: "MicroBuild Signing Task (DevDiv)"
outputs:
- output: pipelineArtifact
targetPath: $(build.artifactstagingdirectory)/build/$(artifact_name)
Expand Down

0 comments on commit 4ab6989

Please sign in to comment.