Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
24f93a2
Make the PR pipelines use docker based builds for Ubuntu 1804
robertasaldanaf Dec 13, 2023
9d0dd0d
Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool.
robertasaldanaf Dec 14, 2023
4531da8
Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool.
robertasaldanaf Dec 14, 2023
664fd7d
Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool.
robertasaldanaf Dec 14, 2023
d342003
Test:2 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool.
robertasaldanaf Dec 14, 2023
085c325
Test:3 - adding @self at end of template: in do-docker-jobs.yml
robertasaldanaf Dec 14, 2023
1784a9c
Test:4 - added full path to 'stepsTemplate:' and indented 'jobs'
robertasaldanaf Dec 14, 2023
f758972
Test:5 indented 'stages'
robertasaldanaf Dec 14, 2023
28c2631
Test:6 added full path to do-docker-jobs.yml
robertasaldanaf Dec 14, 2023
273262b
Test:7
robertasaldanaf Dec 15, 2023
be24622
Test:7 adding the self job in do-docker-jobs.yml
robertasaldanaf Dec 15, 2023
4d5214e
Test:8 added templateContext to docker-steps
robertasaldanaf Dec 19, 2023
28e6188
Test:9 indented docker-steps::16
robertasaldanaf Dec 19, 2023
914d1c3
Test:10 revert to original doclient-lite-docker-steps and added the t…
robertasaldanaf Dec 19, 2023
747aba1
Test:11 remove publish in do-docker-jobs
robertasaldanaf Dec 19, 2023
2036622
Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool.
robertasaldanaf Dec 14, 2023
077922c
Merge branch 'robertasa' of https://github.com/microsoft/do-client in…
robertasaldanaf Dec 19, 2023
05dc755
Remove all comments
robertasaldanaf Dec 19, 2023
50de90c
Test1 changing pool of dopapt-ubuntu1804.yml
robertasaldanaf Dec 19, 2023
90a851b
Test1 changing pool of dopapt-ubuntu1804.yml
robertasaldanaf Dec 19, 2023
c80ea53
Test1 changing pool of dosdkcpp-ubuntu1804.yml
robertasaldanaf Dec 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,44 @@
variables:
- name: imageVersion
value: 0.8.0
- name: containerImageVersion
value: 0.9.0

trigger:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/doclient-lite-native-steps.yml
- client-lite/*
- common/*
- build/build.py
- CMakeLists.txt
exclude:
- azure-pipelines/*
- none

pr:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/doclient-lite-native-steps.yml
- client-lite/*
- common/*
- build/build.py
- CMakeLists.txt
exclude:
- azure-pipelines/*
- none

pool:
name: 1es_hosted_pool_ubuntu_1804
demands: ImageOverride -equals do-adu-build-$(imageVersion)
resources:
repositories:
- repository: 1ESPipelineTemplates
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

jobs:
- job: Debug
steps:
- template: ../templates/doclient-lite-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: debug

- job: Release
steps:
- template: ../templates/doclient-lite-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: minsizerel
skipTests: true
extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
pool:
name: Azure-Pipelines-1ESPT-ExDShared
image: ubuntu-latest
os: linux
sdl:
sourceAnalysisPool:
name: Azure-Pipelines-1ESPT-ExDShared
image: windows-latest
os: windows
suppression:
suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
customBuildTags:
- ES365AIMigrationTooling

stages:
- stage: build
jobs:
- template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
parameters:
targetOsArch: 'ubuntu1804_x64'
imageVersion: ${{variables.containerImageVersion}}
stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml'
81 changes: 35 additions & 46 deletions azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,43 @@
variables:
- name: imageVersion
value: 0.8.0
- name: containerImageVersion
value: 0.9.0

trigger:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/dopapt-native-steps.yml
- common/*
- plugins/*
- build/build.py
- CMakeLists.txt
exclude:
- 'azure-pipelines/*'
- 'plugins/linux-apt/scripts/configure-apt-method.sh'

- none
pr:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/dopapt-native-steps.yml
- common/*
- plugins/*
- build/build.py
- CMakeLists.txt
exclude:
- 'azure-pipelines/*'
- 'plugins/linux-apt/scripts/configure-apt-method.sh'

pool:
name: 1es_hosted_pool_ubuntu_1804
demands: ImageOverride -equals do-adu-build-$(imageVersion)
- none

jobs:
- job: Debug
steps:
- template: ../templates/dopapt-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: debug
resources:
repositories:
- repository: 1ESPipelineTemplates
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

- job: Release
steps:
- template: ../templates/dopapt-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: minsizerel
extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
pool:
name: Azure-Pipelines-1ESPT-ExDShared
image: ubuntu-latest
os: linux
sdl:
sourceAnalysisPool:
name: Azure-Pipelines-1ESPT-ExDShared
image: windows-latest
os: windows
suppression:
suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
customBuildTags:
- ES365AIMigrationTooling

stages:
- stage: build
jobs:
- template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
parameters:
targetOsArch: 'ubuntu1804_x64'
imageVersion: ${{variables.containerImageVersion}}
stepsTemplate: 'dopapt-docker-steps.yml'
79 changes: 34 additions & 45 deletions azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,44 @@
variables:
- name: imageVersion
value: 0.8.0
- name: containerImageVersion
value: 0.9.0

trigger:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/dosdkcpp-native-steps.yml
- common/*
- sdk-cpp/*
- build/build.py
- CMakeLists.txt
exclude:
- azure-pipelines/*
- sdk-cpp/build/cleanup-install.sh
- none

pr:
branches:
include:
- develop
paths:
include:
- azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
- azure-pipelines/build/linux/du/templates/dosdkcpp-native-steps.yml
- common/*
- sdk-cpp/*
- build/build.py
- CMakeLists.txt
exclude:
- azure-pipelines/*
- sdk-cpp/build/cleanup-install.sh
- none

pool:
name: 1es_hosted_pool_ubuntu_1804
demands: ImageOverride -equals do-adu-build-$(imageVersion)
resources:
repositories:
- repository: 1ESPipelineTemplates
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

jobs:
- job: Debug
steps:
- template: ../templates/dosdkcpp-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: debug
extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
pool:
name: Azure-Pipelines-1ESPT-ExDShared
image: ubuntu-latest
os: linux
sdl:
sourceAnalysisPool:
name: Azure-Pipelines-1ESPT-ExDShared
image: windows-latest
os: windows
suppression:
suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
customBuildTags:
- ES365AIMigrationTooling

- job: Release
steps:
- template: ../templates/dosdkcpp-native-steps.yml
parameters:
targetOsArch: 'ubuntu1804_x64'
config: minsizerel
skipTests: true
stages:
- stage: build
jobs:
- template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
parameters:
targetOsArch: 'ubuntu1804_x64'
imageVersion: ${{variables.containerImageVersion}}
stepsTemplate: 'dosdkcpp-docker-steps.yml'
20 changes: 14 additions & 6 deletions azure-pipelines/build/linux/du/templates/do-docker-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,30 @@ parameters:
type: string

jobs:
- job: ${{parameters.targetOsArch}}
steps:
- checkout: self
path: 's' # Copy to sources directory (templates do not do this automatically)

- job: ${{parameters.targetOsArch}}_debug
steps:
- template: ${{parameters.stepsTemplate}}
- template: ${{parameters.stepsTemplate}}@self
parameters:
targetOsArch: ${{parameters.targetOsArch}}
imageVersion: ${{parameters.imageVersion}}
config: debug
- publish: $(Build.ArtifactStagingDirectory)
artifact: 'doclient-drop-${{parameters.targetOsArch}}-debug'

- job: ${{parameters.targetOsArch}}_release
steps:
- template: ${{parameters.stepsTemplate}}
- template: ${{parameters.stepsTemplate}}@self
parameters:
targetOsArch: ${{parameters.targetOsArch}}
imageVersion: ${{parameters.imageVersion}}
config: minsizerel
- publish: $(Build.ArtifactStagingDirectory)
artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel'

templateContext:
outputs:
- output: pipelineArtifact
displayName: 'Publish artifacts'
targetPath: '$(Build.ArtifactStagingDirectory)'
artifact: 'doclient-drop-${{parameters.targetOsArch}}'