diff options
| -rw-r--r-- | .ci/templates/job-uhd-build-src.yml | 43 | ||||
| -rw-r--r-- | .ci/templates/steps-build-uhd-ubuntu-deb.yml | 17 | ||||
| -rw-r--r-- | .ci/uhd-pipeline.yml | 3 |
3 files changed, 49 insertions, 14 deletions
diff --git a/.ci/templates/job-uhd-build-src.yml b/.ci/templates/job-uhd-build-src.yml index 366bb7509..a3c63897a 100644 --- a/.ci/templates/job-uhd-build-src.yml +++ b/.ci/templates/job-uhd-build-src.yml @@ -5,6 +5,7 @@ parameters: - make - ninja - msbuild + - ubuntu_deb jobs: - job: build_ctest_and_upload_uhd_${{ parameters.toolset }} @@ -16,6 +17,7 @@ jobs: dockerImagePrefix: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImagePrefix'] ] 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'] ] pool: ${{ if eq(parameters.toolset, 'msbuild') }}: name: de-dre-lab @@ -32,11 +34,16 @@ jobs: strategy: ${{ if eq(parameters.toolset, 'msbuild') }}: matrix: $[ variables.dockerImageMatrixWin ] - ${{ if ne(parameters.toolset, 'msbuild') }}: + ${{ if or(eq(parameters.toolset, 'make'), eq(parameters.toolset, 'ninja')) }}: matrix: $[ variables.dockerImageMatrixLin ] + ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: + matrix: $[ variables.dockerImageMatrixUbuntuDeb ] container: image: '$(dockerImagePrefix)$(DockerImageName):$(dockerBuildNumber)' endpoint: 'Docker / Artifactory - rnd-builds-local' + ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: + #pbuilder requires access to /proc + options: --privileged steps: - checkout: self clean: true @@ -65,6 +72,13 @@ jobs: vsArch: $(vsArch) vsYear: $(vsYear) + - ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: + - template: steps-build-uhd-ubuntu-deb.yml + parameters: + uhdSrcDir: $(Build.SourcesDirectory) + uhdBuildDir: $(Build.BinariesDirectory)/uhddev + ubuntuReleaseName: $(ubuntuReleaseName) + - task: ArchiveFiles@2 inputs: rootFolderOrFile: $(Build.BinariesDirectory) @@ -87,17 +101,18 @@ jobs: artifactName: '$(dockerOSName)-${{ parameters.toolset }}' displayName: Upload uhd build artifacts - - task: CopyFiles@2 - inputs: - sourceFolder: $(Build.BinariesDirectory)/uhddev/ - contents: build/Testing/** - targetFolder: $(Common.TestResultsDirectory) - displayName: Copy ${{ parameters.toolset }} ctest results + - ${{ if ne(parameters.toolset, 'ubuntu_deb') }}: + - task: CopyFiles@2 + inputs: + sourceFolder: $(Build.BinariesDirectory)/uhddev/ + contents: build/Testing/** + targetFolder: $(Common.TestResultsDirectory) + displayName: Copy ${{ parameters.toolset }} ctest results - - task: PublishTestResults@2 - inputs: - testResultsFormat: cTest - testResultsFiles: $(Common.TestResultsDirectory)/build/Testing/**/Test.xml - failTaskOnFailedTests: true - testRunTitle: uhd ctest $(dockerOSName)-${{ parameters.toolset }} - displayName: Publish $(dockerOSName)-${{ parameters.toolset }} ctest results + - task: PublishTestResults@2 + inputs: + testResultsFormat: cTest + testResultsFiles: $(Common.TestResultsDirectory)/build/Testing/**/Test.xml + failTaskOnFailedTests: true + testRunTitle: uhd ctest $(dockerOSName)-${{ parameters.toolset }} + displayName: Publish $(dockerOSName)-${{ parameters.toolset }} ctest results diff --git a/.ci/templates/steps-build-uhd-ubuntu-deb.yml b/.ci/templates/steps-build-uhd-ubuntu-deb.yml new file mode 100644 index 000000000..6ad6680f2 --- /dev/null +++ b/.ci/templates/steps-build-uhd-ubuntu-deb.yml @@ -0,0 +1,17 @@ +parameters: +- name: uhdSrcDir + type: string +- name: uhdBuildDir + type: string +- name: ubuntuReleaseName + type: string + +steps: +- script: | + sudo pbuilder create --debootstrapopts --variant=buildd --distribution ${{ parameters.ubuntuReleaseName }} + displayName: Setup pbuilder +- script: | + mkdir -p ${{ parameters.uhdBuildDir }} + cd ${{ parameters.uhdSrcDir }} + python3 tools/debs/uhd_ubuntu_deb.py ${{ parameters.ubuntuReleaseName }} --buildpath ${{ parameters.uhdBuildDir }} + displayName: Build dsc and debs diff --git a/.ci/uhd-pipeline.yml b/.ci/uhd-pipeline.yml index 481e5a03d..593ac20e9 100644 --- a/.ci/uhd-pipeline.yml +++ b/.ci/uhd-pipeline.yml @@ -40,6 +40,9 @@ stages: - template: templates/job-uhd-build-src.yml parameters: toolset: msbuild + - template: templates/job-uhd-build-src.yml + parameters: + toolset: ubuntu_deb - stage: test_uhd_stage displayName: Test UHD |