diff options
author | Steven Koo <steven.koo@ni.com> | 2022-04-22 16:08:30 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-06-10 13:24:04 -0500 |
commit | b8a21959a6f51c73766cac5bb09ee240bf497e2b (patch) | |
tree | 961e6c9f84d532a536e77e7ed9a3188be801b0f2 | |
parent | 3fba2109feb92738844cd5174f31cd3d9dd231cf (diff) | |
download | uhd-b8a21959a6f51c73766cac5bb09ee240bf497e2b.tar.gz uhd-b8a21959a6f51c73766cac5bb09ee240bf497e2b.tar.bz2 uhd-b8a21959a6f51c73766cac5bb09ee240bf497e2b.zip |
ci: Add package builder container entry
This container will be used to build the src tarballs.
Signed-off-by: Steven Koo <steven.koo@ni.com>
-rw-r--r-- | .ci/templates/job-get-latest-uhd-docker.yml | 4 | ||||
-rw-r--r-- | .ci/templates/job-gnuradio-grettus-build-src.yml | 1 | ||||
-rw-r--r-- | .ci/templates/job-uhd-build-installer.yml | 2 | ||||
-rw-r--r-- | .ci/templates/job-uhd-build-src.yml | 1 | ||||
-rw-r--r-- | .ci/uhd-build-docker-container.yml | 6 |
5 files changed, 14 insertions, 0 deletions
diff --git a/.ci/templates/job-get-latest-uhd-docker.yml b/.ci/templates/job-get-latest-uhd-docker.yml index ad46db9b0..339bff40f 100644 --- a/.ci/templates/job-get-latest-uhd-docker.yml +++ b/.ci/templates/job-get-latest-uhd-docker.yml @@ -29,12 +29,15 @@ jobs: docker_image_matrix_win=$(sed '4q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName)) docker_image_matrix_ubuntu_deb=$(sed '5q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName)) macos_builders=$(sed '6q;d' $(UHDPipelineDockerImageArtifactName)/$(UHDPipelineDockerImageArtifactName)) + docker_image_matrix_source_package=$(sed '7q;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" echo "##vso[task.setvariable variable=macOSBuilders;isOutput=true;]$macos_builders" + echo "##vso[task.setvariable variable=dockerImageMatrixSourcePackageBuilders;isOutput=true;]$docker_image_matrix_source_package" name: setDockerVar - script: | echo "Docker Build Number: " @@ -44,4 +47,5 @@ jobs: echo $(setDockerVar.dockerImageMatrixWin) echo $(setDockerVar.dockerImageMatrixUbuntuDeb) echo $(setDockerVar.macOSBuilders) + echo $(setDockerVar.dockerImageMatrixSourcePackageBuilders) name: echoDockerVar diff --git a/.ci/templates/job-gnuradio-grettus-build-src.yml b/.ci/templates/job-gnuradio-grettus-build-src.yml index 90521f807..99ffa46b5 100644 --- a/.ci/templates/job-gnuradio-grettus-build-src.yml +++ b/.ci/templates/job-gnuradio-grettus-build-src.yml @@ -16,6 +16,7 @@ jobs: dockerImageMatrixWin: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixWin'] ] dockerImageMatrixUbuntuDeb: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixUbuntuDeb'] ] macOSBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.macOSBuilders'] ] + dockerImageMatrixSourcePackageBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixSourcePackageBuilders'] ] pool: ${{ if eq(parameters.toolset, 'msbuild') }}: name: de-dre-lab diff --git a/.ci/templates/job-uhd-build-installer.yml b/.ci/templates/job-uhd-build-installer.yml index 05df0fc39..ebe6a68bc 100644 --- a/.ci/templates/job-uhd-build-installer.yml +++ b/.ci/templates/job-uhd-build-installer.yml @@ -24,6 +24,8 @@ jobs: dockerImageMatrixLin: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixLin'] ] dockerImageMatrixWin: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixWin'] ] dockerImageMatrixUbuntuDeb: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixUbuntuDeb'] ] + macOSBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.macOSBuilders'] ] + dockerImageMatrixSourcePackageBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixSourcePackageBuilders'] ] pool: ${{ if eq(parameters.toolset, 'msbuild') }}: name: de-dre-lab diff --git a/.ci/templates/job-uhd-build-src.yml b/.ci/templates/job-uhd-build-src.yml index 503ef27a1..b894b88bc 100644 --- a/.ci/templates/job-uhd-build-src.yml +++ b/.ci/templates/job-uhd-build-src.yml @@ -27,6 +27,7 @@ jobs: dockerImageMatrixWin: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixWin'] ] dockerImageMatrixUbuntuDeb: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixUbuntuDeb'] ] macOSBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.macOSBuilders'] ] + dockerImageMatrixSourcePackageBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixSourcePackageBuilders'] ] pool: ${{ if eq(parameters.toolset, 'msbuild') }}: name: de-dre-lab diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml index bb5198a89..74379a601 100644 --- a/.ci/uhd-build-docker-container.yml +++ b/.ci/uhd-build-docker-container.yml @@ -67,6 +67,11 @@ variables: value: "{'macOS-12-x64':{'buildOSName':'macOS-12-x64', 'macOSVersionDemand':'12', 'macOSArchDemand': 'X64'}}" +- name: sourcePackageBuilders + # Match with one of the Ubuntu images in linuxDockerImages + value: + "{'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}}" + - name: dockerImagePrefix value: 'rfsdr/' @@ -212,6 +217,7 @@ jobs: echo "${{ variables.winDockerImages }}" >> $(UHDPipelineDockerImageArtifactName) echo "${{ variables.ubuntuDebDockerImages }}" >> $(UHDPipelineDockerImageArtifactName) echo "${{ variables.macOSBuilders }}" >> $(UHDPipelineDockerImageArtifactName) + echo "${{ variables.sourcePackageBuilders }}" >> $(UHDPipelineDockerImageArtifactName) displayName: Generate created image list - task: PublishPipelineArtifact@1 inputs: |