Use 1ES Self-Hosted Images provisioned with dependencies

azure-pipelines/build/doclient-lite-docker.yml

@@ -14,12 +14,7 @@ schedules:
     include:
     - main
 
-# TODO(jimson): Provision a 1ES managed image with artifacts that have all our dependencies preinstalled
-#pool: 1es_hosted_pool_ubuntu_1804
-
-# The microsoft-hosted agents come with docker preinstalled, the caveat being that the bootstrap script needs to be called to provision everything else
-pool:
-  vmImage: 'ubuntu-18.04'
+pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:
 - template: templates/do-docker-jobs.yml

azure-pipelines/build/doclient-lite-native.yml

@@ -37,8 +37,6 @@ pr:
     exclude:
       - azure-pipelines/*
 
-# TODO(jimson): This is a base Ubuntu 1804 Image right now, switch to an image that contains all our dependencies preinstalled
-# The advantage to using this over the Microsoft-hosted agent is parallel execution of jobs (infinite # of vms can be spun up at execution time)
 pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:

azure-pipelines/build/dopapt-docker.yml

@@ -14,12 +14,7 @@ schedules:
     include:
     - main
 
-# TODO(jimson): Provision a 1ES managed image with artifacts that have all our dependencies preinstalled
-#pool: 1es_hosted_pool_ubuntu_1804
-
-# The microsoft-hosted agents come with docker preinstalled, the caveat being that the bootstrap script needs to be called to provision everything else
-pool:
-  vmImage: 'ubuntu-18.04'
+pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:
 - template: templates/do-docker-jobs.yml

azure-pipelines/build/dopapt-native.yml

@@ -39,8 +39,6 @@ pr:
       - 'azure-pipelines/*'
       - 'plugins/linux-apt/scripts/configure-apt-method.sh'
 
-# TODO(jimson): This is a base Ubuntu 1804 Image right now, switch to an image that contains all our dependencies preinstalled
-# The advantage to using this over the Microsoft-hosted agent is parallel execution of jobs (infinite # of vms can be spun up at execution time)
 pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:

azure-pipelines/build/dosdkcpp-docker.yml

@@ -14,12 +14,7 @@ schedules:
     include:
     - main
 
-# TODO(jimson): Provision a 1ES managed image with artifacts that have all our dependencies preinstalled
-#pool: 1es_hosted_pool_ubuntu_1804
-
-# The microsoft-hosted agents come with docker preinstalled, the caveat being that the bootstrap script needs to be called to provision everything else
-pool:
-  vmImage: 'ubuntu-18.04'
+pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:
 - template: templates/do-docker-jobs.yml

azure-pipelines/build/dosdkcpp-native.yml

@@ -40,8 +40,6 @@ pr:
       - azure-pipelines/*
       - sdk-cpp/build/cleanup-install.sh
 
-# TODO(jimson): This is a base Ubuntu 1804 Image right now, switch to an image that contains all our dependencies preinstalled
-# The advantage to using this over the Microsoft-hosted agent is parallel execution of jobs (infinite # of vms can be spun up at execution time)
 pool: 1es_hosted_pool_ubuntu_1804
 
 jobs:

azure-pipelines/build/templates/doclient-lite-docker-steps.yml

@@ -24,20 +24,6 @@ steps:
     containerRegistry: doclientcontainerregistry
     arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:latest'
 
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps as well as the targetOS parameter
-# Another alternative is to just do the pipeline run from within a docker container, and then run the tests on the host
-- task: CmdLine@2
-  inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOS}} --install qemu'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install & register QEMU'
-
 - task: CmdLine@2
   inputs:
   # Unix Makefiles used in place of Ninja due to issues with 32-bit compatability on cross-arch builds

azure-pipelines/build/templates/doclient-lite-native-steps.yml

@@ -13,20 +13,6 @@ parameters:
   default: false
 
 steps:
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps
-# Another alternative is to just do the build from within a docker container, and then run the tests on the host
-- task: CmdLine@2
-  inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOS}}'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install Dependencies'
-
 # Have to use cmdline rather than built in python task, because the python env variable chooses python2
 # There is a pipeline task which allows you to specify version, but that requires configuring of the agent tools directory
 - task: CmdLine@2

azure-pipelines/build/templates/dopapt-docker-steps.yml

@@ -26,20 +26,6 @@ steps:
     containerRegistry: doclientcontainerregistry
     arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:latest'
 
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps as well as the targetOS parameter
-# Another alternative is to just do the pipeline run from within a docker container, and then run the tests on the host
-- task: CmdLine@2
-  inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOS}} --install qemu'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install & register QEMU'
-
 - task: CmdLine@2
   inputs:
     script: 'sudo docker run --rm --entrypoint=/bin/bash -v $(Build.SourcesDirectory):/code -v /tmp/build-deliveryoptimization-plugin-apt-${{parameters.targetOsArch}}:/tmp/build-deliveryoptimization-plugin-apt doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:latest "/code/build/docker/docker-build-plugin.sh" "/code" "${{parameters.config}}"'

azure-pipelines/build/templates/dopapt-native-steps.yml

@@ -12,36 +12,12 @@ parameters:
 steps:
 - checkout: self
 
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps
-# Another alternative is to just do the build from within a docker container, and then run the tests on the host
 - task: CmdLine@2
   inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOS}}'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install Dependencies'
-
-# Have to use cmdline rather than built in python task, because the python env variable chooses python2
-# There is a pipeline task which allows you to specify version, but that requires configuring of the agent tools directory
-- task: CmdLine@2
-  inputs:
-    script: 'python3 ./build.py --project sdk --config ${{parameters.config}} --package-for DEB --clean'
+    script: 'python3 ./build.py --project sdk --cmaketarget deliveryoptimization --config ${{parameters.config}} --package-for DEB --clean'
     workingDirectory: '$(Build.SourcesDirectory)/build'
   displayName: 'Build sdk ${{parameters.targetOsArch}}-${{parameters.config}}'
 
-#TODO(jimson): why did this have --cmaketarget flag?
-#- task: PythonScript@0
-#  inputs:
-#    scriptSource: 'filePath'
-#    scriptPath: 'build/build.py'
-#    arguments: '--project sdk --cmaketarget deliveryoptimization --config ${{parameters.config}} --package-for DEB --clean '
-#  displayName: 'Build sdk ${{parameters.targetOsArch}}-${{parameters.config}}'
-
 - task: Bash@3
   inputs:
     targetType: 'inline'
@@ -57,13 +33,6 @@ steps:
     workingDirectory: '$(Build.SourcesDirectory)/build'
   displayName: 'Build deliveryoptimization-plugin-apt ${{parameters.targetOsArch}}-${{parameters.config}}'
 
-#- task: PythonScript@0
-#  inputs:
-#    scriptSource: 'filePath'
-#    scriptPath: 'build/build.py'
-#    arguments: '--project plugin-apt --config ${{parameters.config}} --package-for DEB --clean'
-#  displayName: 'Build deliveryoptimization-plugin-apt ${{parameters.targetOsArch}}-${{parameters.config}}'
-
 - task: Bash@3
   condition: eq('${{parameters.config}}', 'minsizerel')
   inputs:

azure-pipelines/build/templates/dosdkcpp-docker-steps.yml

@@ -24,20 +24,6 @@ steps:
     containerRegistry: doclientcontainerregistry
     arguments: 'doclientcontainerregistry.azurecr.io/${{parameters.targetOsArch}}:latest'
 
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps as well as the targetOS parameter
-# Another alternative is to just do the pipeline run from within a docker container, and then run the tests on the host
-- task: CmdLine@2
-  inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOS}} --install qemu'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install & register QEMU'
-
 - task: CmdLine@2
   inputs:
   # Unix Makefiles used in place of Ninja due to issues with 32-bit compatability on cross-arch builds

azure-pipelines/build/templates/dosdkcpp-native-steps.yml

@@ -13,20 +13,6 @@ parameters:
   default: false
 
 steps:
-# TODO(jimson): Once these are onboarded as an artifact to Image Factory, can remove the below two steps
-# Another alternative is to just do the build from within a docker container, and then run the tests on the host
-- task: CmdLine@2
-  inputs:
-    script: 'chmod +x bootstrap.sh'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'chmod bootstrap script'
-
-- task: CmdLine@2
-  inputs:
-    script: 'sudo ./bootstrap.sh --platform ${{parameters.targetOs}}'
-    workingDirectory: '$(Build.SourcesDirectory)/build'
-  displayName: 'Install Dependencies'
-
 # Have to use cmdline rather than built in python task, because the python env variable chooses python2
 # There is a pipeline task which allows you to specify version, but that requires configuring of the agent tools directory
 # TODO(shishirb) Include --skip-tests build.py option when skipTests is true