ci: Update docker images for Ubuntu with pbuilder

This changes adds pbuilder to the docker files to support building dsc
into debs for use with uhd_ubuntu_deb.py.

Signed-off-by: Steven Koo <steven.koo@ni.com>

4 files changed, 31 insertions, 0 deletions

diff --git a/.ci/docker/uhd-builder-ubuntu1804.Dockerfile b/.ci/docker/uhd-builder-ubuntu1804.Dockerfile
index 1afb27473..ddee8b88d 100644
--- a/.ci/docker/uhd-builder-ubuntu1804.Dockerfile
+++ b/.ci/docker/uhd-builder-ubuntu1804.Dockerfile
@@ -34,5 +34,12 @@ RUN apt-get update && \
         python3-numpy \
         python3-pip \
         python3-requests \
+    # Install deb dependencies
+        debootstrap \
+        devscripts \
+        pbuilder \
+        debhelper \
+        libncurses5-dev \
+        python3-ruamel.yaml \
         && \
     rm -rf /var/lib/apt/lists/*
diff --git a/.ci/docker/uhd-builder-ubuntu2004.Dockerfile b/.ci/docker/uhd-builder-ubuntu2004.Dockerfile
index 3b7d1ab41..2206e566a 100644
--- a/.ci/docker/uhd-builder-ubuntu2004.Dockerfile
+++ b/.ci/docker/uhd-builder-ubuntu2004.Dockerfile
@@ -34,5 +34,18 @@ RUN apt-get update && \
         python3-numpy \
         python3-pip \
         python3-requests \
+    # Install deb dependencies
+        debootstrap \
+        devscripts \
+        pbuilder \
+        debhelper \
+        libncurses5-dev \
+        python3-ruamel.yaml \
         && \
     rm -rf /var/lib/apt/lists/*
+
+# Required for running pbuilder to build debs in docker on Ubuntu 20.04
+# because of this bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=968927
+RUN wget https://launchpad.net/ubuntu/+archive/primary/+files/debootstrap_1.0.124_all.deb && \
+    dpkg -i debootstrap_1.0.124_all.deb && \
+    rm debootstrap_1.0.124_all.deb
diff --git a/.ci/templates/job-get-latest-uhd-docker.yml b/.ci/templates/job-get-latest-uhd-docker.yml
index c90320d78..a6b712fb0 100644
--- a/.ci/templates/job-get-latest-uhd-docker.yml
+++ b/.ci/templates/job-get-latest-uhd-docker.yml
@@ -6,6 +6,7 @@
 # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImagePrefix'] ]
 # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixLin'] ]
 # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixWin'] ]
+# $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixUbuntuDeb'] ]
 jobs:
 - job: get_latest_uhd_docker
   displayName: Get Last Docker Build Version
@@ -22,10 +23,12 @@ jobs:
       docker_image_prefix=$(sed '2q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName))
       docker_image_matrix_lin=$(sed '3q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName))
       docker_image_matrix_win=$(sed '4q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName))
+      docker_image_matrix_ubuntu_deb=$(sed '5q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName))
       echo "##vso[task.setvariable variable=dockerBuildNumber;isOutput=true;]$docker_build_number"
       echo "##vso[task.setvariable variable=dockerImagePrefix;isOutput=true;]$docker_image_prefix"
       echo "##vso[task.setvariable variable=dockerImageMatrixLin;isOutput=true;]$docker_image_matrix_lin"
       echo "##vso[task.setvariable variable=dockerImageMatrixWin;isOutput=true;]$docker_image_matrix_win"
+      echo "##vso[task.setvariable variable=dockerImageMatrixUbuntuDeb;isOutput=true;]$docker_image_matrix_ubuntu_deb"
     name: setDockerVar
   - script: |
       echo "Docker Build Number: "
@@ -33,4 +36,5 @@ jobs:
       echo $(setDockerVar.dockerImagePrefix)
       echo $(setDockerVar.dockerImageMatrixLin)
       echo $(setDockerVar.dockerImageMatrixWin)
+      echo $(setDockerVar.dockerImageMatrixUbuntuDeb)
     name: echoDockerVar
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index f674b4341..80e21825f 100644
--- a/.ci/uhd-build-docker-container.yml
+++ b/.ci/uhd-build-docker-container.yml
@@ -30,6 +30,12 @@ variables:
     'VS2019-x86-builder':{'dockerOSName':'win-vs19-v142-x86','dockerImageName':'uhd-builder-vs2019-v142-x86','cmakeCompiler':'Visual Studio 16 2019','cmakeArch':'Win32','vsArch':'x86','vsYear':'2019'},
     'VS2019-x64-builder':{'dockerOSName':'win-vs19-v142-x64','dockerImageName':'uhd-builder-vs2019-v142-x64','cmakeCompiler':'Visual Studio 16 2019','cmakeArch':'x64','vsArch':'x64','vsYear':'2019'}}"
 
+- name: ubuntuDebDockerImages
+  # Match with Ubuntu images in linuxDockerImages
+  value:
+    "{'Ubuntu-1804-builder':{'dockerOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804','ubuntuReleaseName':'bionic'},
+    'Ubuntu-2004-builder':{'dockerOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}}"
+
 - name: dockerImagePrefix
   value: 'rfsdr/'
 
@@ -173,6 +179,7 @@ jobs:
       echo "${{ variables.dockerImagePrefix }}" >> $(UHDPipelineDockerImageArtifactName)
       echo "${{ variables.linuxDockerImages }}" >> $(UHDPipelineDockerImageArtifactName)
       echo "${{ variables.winDockerImages }}" >> $(UHDPipelineDockerImageArtifactName)
+      echo "${{ variables.ubuntuDebDockerImages }}" >> $(UHDPipelineDockerImageArtifactName)
     displayName: Generate created image list
   - task: PublishPipelineArtifact@1
     inputs: