From 24f93a246321f53958057d7176b52fdc9439006d Mon Sep 17 00:00:00 2001 From: robertasa Date: Wed, 13 Dec 2023 17:04:46 -0600 Subject: [PATCH 01/20] Make the PR pipelines use docker based builds for Ubuntu 1804 --- .../du/native/doclient-lite-ubuntu1804.yml | 89 ++++++++++-------- .../linux/du/native/dopapt-ubuntu1804.yml | 91 ++++++++++-------- .../linux/du/native/dosdkcpp-ubuntu1804.yml | 93 +++++++++++-------- 3 files changed, 153 insertions(+), 120 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index fe94dde2..2f825892 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -4,53 +4,64 @@ 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 + # 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/* 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 + # 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/* pool: name: 1es_hosted_pool_ubuntu_1804 demands: ImageOverride -equals do-adu-build-$(imageVersion) jobs: -- job: Debug - steps: - - template: ../templates/doclient-lite-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: debug +- template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: 'doclient-lite-docker-steps.yml' -- job: Release - steps: - - template: ../templates/doclient-lite-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: minsizerel - skipTests: true +# 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 diff --git a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml index bd7aed87..d9bd939f 100644 --- a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml @@ -4,54 +4,65 @@ 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 + # 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' 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' +- none + # 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) jobs: -- job: Debug - steps: - - template: ../templates/dopapt-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: debug +- template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: 'dopapt-docker-steps.yml' -- job: Release - steps: - - template: ../templates/dopapt-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: minsizerel \ No newline at end of file +# jobs: +# - job: Debug +# steps: +# - template: ../templates/dopapt-native-steps.yml +# parameters: +# targetOsArch: 'ubuntu1804_x64' +# config: debug + +# - job: Release +# steps: +# - template: ../templates/dopapt-native-steps.yml +# parameters: +# targetOsArch: 'ubuntu1804_x64' +# config: minsizerel \ No newline at end of file diff --git a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml index c7722ade..25125a21 100644 --- a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml @@ -5,55 +5,66 @@ 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 + # 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 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 + # 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 pool: name: 1es_hosted_pool_ubuntu_1804 demands: ImageOverride -equals do-adu-build-$(imageVersion) jobs: -- job: Debug - steps: - - template: ../templates/dosdkcpp-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: debug +- template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: 'dosdkcpp-docker-steps.yml' -- job: Release - steps: - - template: ../templates/dosdkcpp-native-steps.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - config: minsizerel - skipTests: true +# jobs: +# - job: Debug +# steps: +# - template: ../templates/dosdkcpp-native-steps.yml +# parameters: +# targetOsArch: 'ubuntu1804_x64' +# config: debug + +# - job: Release +# steps: +# - template: ../templates/dosdkcpp-native-steps.yml +# parameters: +# targetOsArch: 'ubuntu1804_x64' +# config: minsizerel +# skipTests: true From 9d0dd0d1d3f6210d40fc437ccd994ee32e1656ed Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:14:57 -0600 Subject: [PATCH 02/20] Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. --- .../du/native/doclient-lite-ubuntu1804.yml | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 2f825892..b0e82105 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -9,40 +9,36 @@ variables: trigger: - none - # 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/* pr: - none - # 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/* + +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release pool: name: 1es_hosted_pool_ubuntu_1804 demands: ImageOverride -equals do-adu-build-$(imageVersion) +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 + jobs: - template: ../templates/do-docker-jobs.yml parameters: From 4531da842bf35556ef25ec19fa85258f41bc9df5 Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:15:41 -0600 Subject: [PATCH 03/20] Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. --- .../build/linux/du/native/doclient-lite-ubuntu1804.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index b0e82105..0e645604 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -20,9 +20,9 @@ resources: name: 1ESPipelineTemplates/1ESPipelineTemplates ref: refs/tags/release -pool: - name: 1es_hosted_pool_ubuntu_1804 - demands: ImageOverride -equals do-adu-build-$(imageVersion) +# pool: +# name: 1es_hosted_pool_ubuntu_1804 +# demands: ImageOverride -equals do-adu-build-$(imageVersion) parameters: pool: From 664fd7d7c777943238df947a4c6e84714efb76cd Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:17:02 -0600 Subject: [PATCH 04/20] Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. --- .../du/native/doclient-lite-ubuntu1804.yml | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 0e645604..5eb16eb4 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -24,20 +24,22 @@ resources: # name: 1es_hosted_pool_ubuntu_1804 # demands: ImageOverride -equals do-adu-build-$(imageVersion) -parameters: - pool: - name: Azure-Pipelines-1ESPT-ExDShared - image: ubuntu-latest - os: linux - sdl: - sourceAnalysisPool: +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + pool: name: Azure-Pipelines-1ESPT-ExDShared - image: windows-latest - os: windows - suppression: - suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress - customBuildTags: - - ES365AIMigrationTooling + 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 jobs: - template: ../templates/do-docker-jobs.yml From d342003606cee6147f4e4565ec067a526e0a974d Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:20:22 -0600 Subject: [PATCH 05/20] Test:2 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. --- .../linux/du/native/doclient-lite-ubuntu1804.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 5eb16eb4..63cb4222 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -40,13 +40,14 @@ extends: suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress customBuildTags: - ES365AIMigrationTooling - -jobs: -- template: ../templates/do-docker-jobs.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: 'doclient-lite-docker-steps.yml' + stages: + - stage: build + jobs: + - template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: 'doclient-lite-docker-steps.yml' # jobs: # - job: Debug From 085c32575b6a7c8c3cfd72ce702a12899f0f9fb3 Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:24:00 -0600 Subject: [PATCH 06/20] Test:3 - adding @self at end of template: in do-docker-jobs.yml --- azure-pipelines/build/linux/du/templates/do-docker-jobs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 8af63e52..3a17ded5 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -12,7 +12,7 @@ parameters: jobs: - job: ${{parameters.targetOsArch}}_debug steps: - - template: ${{parameters.stepsTemplate}} + - template: ${{parameters.stepsTemplate}}@self parameters: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} @@ -22,7 +22,7 @@ jobs: - job: ${{parameters.targetOsArch}}_release steps: - - template: ${{parameters.stepsTemplate}} + - template: ${{parameters.stepsTemplate}}@self parameters: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} From 1784a9c79f9f1e212f3599922106dcb881dc698f Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:30:26 -0600 Subject: [PATCH 07/20] Test:4 - added full path to 'stepsTemplate:' and indented 'jobs' --- .../linux/du/native/doclient-lite-ubuntu1804.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 63cb4222..55ca1bb5 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -42,12 +42,12 @@ extends: - ES365AIMigrationTooling stages: - stage: build - jobs: - - template: ../templates/do-docker-jobs.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: 'doclient-lite-docker-steps.yml' + jobs: + - template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml' # jobs: # - job: Debug From f758972aa29405f6178c95feeb81842e08602284 Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:45:56 -0600 Subject: [PATCH 08/20] Test:5 indented 'stages' --- .../du/native/doclient-lite-ubuntu1804.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 55ca1bb5..c85210e3 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -40,14 +40,15 @@ extends: suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress customBuildTags: - ES365AIMigrationTooling - stages: - - stage: build - jobs: - - template: ../templates/do-docker-jobs.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml' + + stages: + - stage: build + jobs: + - template: ../templates/do-docker-jobs.yml + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml' # jobs: # - job: Debug From 28c26318604bb0950d7743c522d01152ef0849a9 Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 12:05:32 -0600 Subject: [PATCH 09/20] Test:6 added full path to do-docker-jobs.yml --- .../build/linux/du/native/doclient-lite-ubuntu1804.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index c85210e3..086453b2 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -44,7 +44,7 @@ extends: stages: - stage: build jobs: - - template: ../templates/do-docker-jobs.yml + - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml parameters: targetOsArch: 'ubuntu1804_x64' imageVersion: ${{variables.containerImageVersion}} From 273262bd21849776b05a78e139540a79770910fd Mon Sep 17 00:00:00 2001 From: robertasa Date: Fri, 15 Dec 2023 12:54:46 -0600 Subject: [PATCH 10/20] Test:7 --- .../build/linux/du/native/doclient-lite-ubuntu1804.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 086453b2..1e29fba2 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -24,6 +24,7 @@ resources: # name: 1es_hosted_pool_ubuntu_1804 # demands: ImageOverride -equals do-adu-build-$(imageVersion) + extends: template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: @@ -44,7 +45,7 @@ extends: stages: - stage: build jobs: - - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml + - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self parameters: targetOsArch: 'ubuntu1804_x64' imageVersion: ${{variables.containerImageVersion}} From be24622a4b91fb461166d6685d317bda5b0f0da3 Mon Sep 17 00:00:00 2001 From: robertasa Date: Fri, 15 Dec 2023 12:59:47 -0600 Subject: [PATCH 11/20] Test:7 adding the self job in do-docker-jobs.yml --- azure-pipelines/build/linux/du/templates/do-docker-jobs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 3a17ded5..6626a310 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -10,6 +10,11 @@ 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}}@self From 4d5214e8e5a3cf09840cdefd059a006fd78f504d Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 01:34:53 -0600 Subject: [PATCH 12/20] Test:8 added templateContext to docker-steps --- .../templates/doclient-lite-docker-steps.yml | 96 +++++++++++-------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml index 2a0fd997..66d35859 100644 --- a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml +++ b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml @@ -9,45 +9,57 @@ parameters: - name: config # debug/release/minsizerel/relwithdebuginfo type: string -steps: -- task: Docker@2 - displayName: Login to ACR - inputs: - command: login - containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR - repository: $(parameters.targetOsArch) - -- task: Docker@2 - displayName: Pull latest build image - inputs: - command: pull - containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR - arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}}' - -- task: CmdLine@2 - inputs: - script: 'sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' - displayName: Enable the build VM to run multiarch docker container - -- task: CmdLine@2 - inputs: - script: 'sudo docker run --rm --entrypoint=python3 -v $(Build.SourcesDirectory):/code -v /tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}:/tmp/build-deliveryoptimization-agent doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}} "/code/build/build.py" "--clean" "--package-for" "DEB" "--config" "${{parameters.config}}" "--project" "agent"' - displayName: 'Build client-lite ${{parameters.targetOsArch}}-${{parameters.config}}' - -- task: CopyFiles@2 - inputs: - SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' - Contents: | - deliveryoptimization-agent*.deb - TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' - CleanTargetFolder: true - displayName: 'Populate artifacts staging dir' - -- task: CopyFiles@2 - condition: eq('${{parameters.config}}', 'minsizerel') - inputs: - SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' - Contents: | - client-lite/deliveryoptimization-agent.dbg - TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' - displayName: 'Populate debug symbols to staging dir' +jobs: +- job: ${{parameters.targetOsArch}} + steps: + - checkout: self + path: 's' # Copy to sources directory (templates do not do this automatically) + + - task: Docker@2 + displayName: Login to ACR + inputs: + command: login + containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR + repository: $(parameters.targetOsArch) + + - task: Docker@2 + displayName: Pull latest build image + inputs: + command: pull + containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR + arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}}' + + - task: CmdLine@2 + inputs: + script: 'sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' + displayName: Enable the build VM to run multiarch docker container + + - task: CmdLine@2 + inputs: + script: 'sudo docker run --rm --entrypoint=python3 -v $(Build.SourcesDirectory):/code -v /tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}:/tmp/build-deliveryoptimization-agent doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}} "/code/build/build.py" "--clean" "--package-for" "DEB" "--config" "${{parameters.config}}" "--project" "agent"' + displayName: 'Build client-lite ${{parameters.targetOsArch}}-${{parameters.config}}' + + - task: CopyFiles@2 + inputs: + SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' + Contents: | + deliveryoptimization-agent*.deb + TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' + CleanTargetFolder: true + displayName: 'Populate artifacts staging dir' + + - task: CopyFiles@2 + condition: eq('${{parameters.config}}', 'minsizerel') + inputs: + SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' + Contents: | + client-lite/deliveryoptimization-agent.dbg + TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' + displayName: 'Populate debug symbols to staging dir' + + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish artifacts' + targetPath: '$(Build.ArtifactStagingDirectory)' + artifact: 'doclient-drop-${{parameters.targetOsArch}}' \ No newline at end of file From 28e61884f0f2cdaace8a155e2aa20c82f893dd59 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 11:04:16 -0600 Subject: [PATCH 13/20] Test:9 indented docker-steps::16 --- .../build/linux/du/templates/doclient-lite-docker-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml index 66d35859..0c3548d9 100644 --- a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml +++ b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml @@ -13,7 +13,7 @@ jobs: - job: ${{parameters.targetOsArch}} steps: - checkout: self - path: 's' # Copy to sources directory (templates do not do this automatically) + path: 's' # Copy to sources directory (templates do not do this automatically) - task: Docker@2 displayName: Login to ACR From 914d1c3329f17664bb0c0e66c9f174f52f23b519 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 11:18:04 -0600 Subject: [PATCH 14/20] Test:10 revert to original doclient-lite-docker-steps and added the templateContext to do-docker-jobs --- .../linux/du/templates/do-docker-jobs.yml | 7 ++ .../templates/doclient-lite-docker-steps.yml | 96 ++++++++----------- 2 files changed, 49 insertions(+), 54 deletions(-) diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 6626a310..6d5a7190 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -34,3 +34,10 @@ jobs: 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}}' diff --git a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml index 0c3548d9..2a0fd997 100644 --- a/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml +++ b/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml @@ -9,57 +9,45 @@ parameters: - name: config # debug/release/minsizerel/relwithdebuginfo type: string -jobs: -- job: ${{parameters.targetOsArch}} - steps: - - checkout: self - path: 's' # Copy to sources directory (templates do not do this automatically) - - - task: Docker@2 - displayName: Login to ACR - inputs: - command: login - containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR - repository: $(parameters.targetOsArch) - - - task: Docker@2 - displayName: Pull latest build image - inputs: - command: pull - containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR - arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}}' - - - task: CmdLine@2 - inputs: - script: 'sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' - displayName: Enable the build VM to run multiarch docker container - - - task: CmdLine@2 - inputs: - script: 'sudo docker run --rm --entrypoint=python3 -v $(Build.SourcesDirectory):/code -v /tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}:/tmp/build-deliveryoptimization-agent doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}} "/code/build/build.py" "--clean" "--package-for" "DEB" "--config" "${{parameters.config}}" "--project" "agent"' - displayName: 'Build client-lite ${{parameters.targetOsArch}}-${{parameters.config}}' - - - task: CopyFiles@2 - inputs: - SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' - Contents: | - deliveryoptimization-agent*.deb - TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' - CleanTargetFolder: true - displayName: 'Populate artifacts staging dir' - - - task: CopyFiles@2 - condition: eq('${{parameters.config}}', 'minsizerel') - inputs: - SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' - Contents: | - client-lite/deliveryoptimization-agent.dbg - TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' - displayName: 'Populate debug symbols to staging dir' - - templateContext: - outputs: - - output: pipelineArtifact - displayName: 'Publish artifacts' - targetPath: '$(Build.ArtifactStagingDirectory)' - artifact: 'doclient-drop-${{parameters.targetOsArch}}' \ No newline at end of file +steps: +- task: Docker@2 + displayName: Login to ACR + inputs: + command: login + containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR + repository: $(parameters.targetOsArch) + +- task: Docker@2 + displayName: Pull latest build image + inputs: + command: pull + containerRegistry: doclient-dockercontainerregistry-buildpipeline # name of the service connection that connect the pipeline to the ACR + arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}}' + +- task: CmdLine@2 + inputs: + script: 'sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes' + displayName: Enable the build VM to run multiarch docker container + +- task: CmdLine@2 + inputs: + script: 'sudo docker run --rm --entrypoint=python3 -v $(Build.SourcesDirectory):/code -v /tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}:/tmp/build-deliveryoptimization-agent doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:${{parameters.imageVersion}} "/code/build/build.py" "--clean" "--package-for" "DEB" "--config" "${{parameters.config}}" "--project" "agent"' + displayName: 'Build client-lite ${{parameters.targetOsArch}}-${{parameters.config}}' + +- task: CopyFiles@2 + inputs: + SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' + Contents: | + deliveryoptimization-agent*.deb + TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' + CleanTargetFolder: true + displayName: 'Populate artifacts staging dir' + +- task: CopyFiles@2 + condition: eq('${{parameters.config}}', 'minsizerel') + inputs: + SourceFolder: '/tmp/build-deliveryoptimization-agent-${{parameters.targetOsArch}}/linux-${{parameters.config}}' + Contents: | + client-lite/deliveryoptimization-agent.dbg + TargetFolder: '$(Build.ArtifactStagingDirectory)/agent-${{parameters.targetOsArch}}-${{parameters.config}}' + displayName: 'Populate debug symbols to staging dir' From 747aba16b9cef07237cf8bbe7013c159c2ff0d04 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 11:24:55 -0600 Subject: [PATCH 15/20] Test:11 remove publish in do-docker-jobs --- .../build/linux/du/templates/do-docker-jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 6d5a7190..29e77643 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -22,8 +22,8 @@ jobs: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} config: debug - - publish: $(Build.ArtifactStagingDirectory) - artifact: 'doclient-drop-${{parameters.targetOsArch}}-debug' + # - publish: $(Build.ArtifactStagingDirectory) + # artifact: 'doclient-drop-${{parameters.targetOsArch}}-debug' - job: ${{parameters.targetOsArch}}_release steps: @@ -32,8 +32,8 @@ jobs: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} config: minsizerel - - publish: $(Build.ArtifactStagingDirectory) - artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel' + # - publish: $(Build.ArtifactStagingDirectory) + # artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel' templateContext: outputs: From 2036622cf2cd061a0d822221230c750d5015193c Mon Sep 17 00:00:00 2001 From: robertasa Date: Thu, 14 Dec 2023 11:14:57 -0600 Subject: [PATCH 16/20] Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. Test:1 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. Test:2 - migrate doclient-lite-ubuntu1804.yml to run on E+D shared pool. Test:3 - adding @self at end of template: in do-docker-jobs.yml Test:4 - added full path to 'stepsTemplate:' and indented 'jobs' Test:5 indented 'stages' Test:6 added full path to do-docker-jobs.yml Test:7 Test:7 adding the self job in do-docker-jobs.yml Test:8 added templateContext to docker-steps Test:9 indented docker-steps::16 Test:10 revert to original doclient-lite-docker-steps and added the templateContext to do-docker-jobs Test:11 remove publish in do-docker-jobs Migrating DO Simple Cliet x86-64 Build Pipeline to run on E+D shared pool. ~:wq :wq :w --- .../du/native/doclient-lite-ubuntu1804.yml | 69 ++++++++++--------- .../linux/du/templates/do-docker-jobs.yml | 24 +++++-- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 2f825892..1e29fba2 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -9,46 +9,47 @@ variables: trigger: - none - # 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/* pr: - none - # 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/* -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: -- template: ../templates/do-docker-jobs.yml +# pool: +# name: 1es_hosted_pool_ubuntu_1804 +# demands: ImageOverride -equals do-adu-build-$(imageVersion) + + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: 'doclient-lite-docker-steps.yml' + 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' # jobs: # - job: Debug diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 8af63e52..29e77643 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -10,22 +10,34 @@ 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' + # - 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' + # - publish: $(Build.ArtifactStagingDirectory) + # artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel' + + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish artifacts' + targetPath: '$(Build.ArtifactStagingDirectory)' + artifact: 'doclient-drop-${{parameters.targetOsArch}}' From 05dc755f6ac5c693426933e86738fb13ca34cb60 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 12:26:08 -0600 Subject: [PATCH 17/20] Remove all comments --- .../du/native/doclient-lite-ubuntu1804.yml | 23 +------------------ .../linux/du/native/dopapt-ubuntu1804.yml | 6 ----- .../linux/du/templates/do-docker-jobs.yml | 4 ---- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml index 1e29fba2..83c7e37b 100644 --- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml @@ -20,11 +20,6 @@ resources: name: 1ESPipelineTemplates/1ESPipelineTemplates ref: refs/tags/release -# pool: -# name: 1es_hosted_pool_ubuntu_1804 -# demands: ImageOverride -equals do-adu-build-$(imageVersion) - - extends: template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: @@ -49,20 +44,4 @@ extends: parameters: targetOsArch: 'ubuntu1804_x64' imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml' - -# 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 + stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml' \ No newline at end of file diff --git a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml index d9bd939f..a485c3ed 100644 --- a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml @@ -45,12 +45,6 @@ pool: name: 1es_hosted_pool_ubuntu_1804 demands: ImageOverride -equals do-adu-build-$(imageVersion) -jobs: -- template: ../templates/do-docker-jobs.yml - parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: 'dopapt-docker-steps.yml' # jobs: # - job: Debug diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml index 29e77643..b5fe7af7 100644 --- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml +++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml @@ -22,8 +22,6 @@ jobs: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} config: debug - # - publish: $(Build.ArtifactStagingDirectory) - # artifact: 'doclient-drop-${{parameters.targetOsArch}}-debug' - job: ${{parameters.targetOsArch}}_release steps: @@ -32,8 +30,6 @@ jobs: targetOsArch: ${{parameters.targetOsArch}} imageVersion: ${{parameters.imageVersion}} config: minsizerel - # - publish: $(Build.ArtifactStagingDirectory) - # artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel' templateContext: outputs: From 50de90c3a30fd4e35f86aeb5b5ce396434ee80c1 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 12:33:51 -0600 Subject: [PATCH 18/20] Test1 changing pool of dopapt-ubuntu1804.yml --- .../linux/du/native/dopapt-ubuntu1804.yml | 78 ++++++++----------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml index a485c3ed..6696490e 100644 --- a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml @@ -9,54 +9,38 @@ variables: trigger: - none - # 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' - pr: - none - # 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) - -# 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 \ No newline at end of file +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 + parameters: + targetOsArch: 'ubuntu1804_x64' + imageVersion: ${{variables.containerImageVersion}} + stepsTemplate: 'dopapt-docker-steps.yml' \ No newline at end of file From 90a851b1d62363946b98f93a4bd545065707d4ee Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 12:34:46 -0600 Subject: [PATCH 19/20] Test1 changing pool of dopapt-ubuntu1804.yml --- azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml index 6696490e..684ab7de 100644 --- a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml @@ -39,7 +39,7 @@ extends: stages: - stage: build jobs: - - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml + - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self parameters: targetOsArch: 'ubuntu1804_x64' imageVersion: ${{variables.containerImageVersion}} From c80ea5375a236fac35643afb7cff287132a18689 Mon Sep 17 00:00:00 2001 From: robertasa Date: Tue, 19 Dec 2023 12:57:10 -0600 Subject: [PATCH 20/20] Test1 changing pool of dosdkcpp-ubuntu1804.yml --- .../linux/du/native/dosdkcpp-ubuntu1804.yml | 80 +++++++------------ 1 file changed, 29 insertions(+), 51 deletions(-) diff --git a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml index 25125a21..6475feca 100644 --- a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml +++ b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml @@ -10,61 +10,39 @@ variables: trigger: - none - # 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 pr: - none - # 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 -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: -- template: ../templates/do-docker-jobs.yml +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: - targetOsArch: 'ubuntu1804_x64' - imageVersion: ${{variables.containerImageVersion}} - stepsTemplate: 'dosdkcpp-docker-steps.yml' + 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 -# jobs: -# - job: Debug -# steps: -# - template: ../templates/dosdkcpp-native-steps.yml -# parameters: -# targetOsArch: 'ubuntu1804_x64' -# config: debug - -# - 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'