diff options
| -rw-r--r-- | .ci/templates/job-get-latest-uhd-docker.yml | 5 | ||||
| -rw-r--r-- | .ci/templates/job-gnuradio-grettus-build-src.yml | 1 | ||||
| -rw-r--r-- | .ci/templates/job-uhd-build-installer.yml | 18 | ||||
| -rw-r--r-- | .ci/templates/job-uhd-build-src.yml | 1 | ||||
| -rw-r--r-- | .ci/templates/stages-uhd-pipeline.yml | 15 | ||||
| -rw-r--r-- | .ci/uhd-build-docker-container.yml | 7 |
6 files changed, 43 insertions, 4 deletions
diff --git a/.ci/templates/job-get-latest-uhd-docker.yml b/.ci/templates/job-get-latest-uhd-docker.yml index 339bff40f..fc5171280 100644 --- a/.ci/templates/job-get-latest-uhd-docker.yml +++ b/.ci/templates/job-get-latest-uhd-docker.yml @@ -8,6 +8,8 @@ # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixWin'] ] # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixUbuntuDeb'] ] # $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.macOSBuilders'] ] +# $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixSourcePackageBuilders'] ] +# $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixFedoraRpm'] ] jobs: - job: get_latest_uhd_docker displayName: Get Last Docker Build Version @@ -30,6 +32,7 @@ jobs: 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)) + docker_image_matrix_fedora_rpm=$(sed '8q;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" @@ -38,6 +41,7 @@ jobs: 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" + echo "##vso[task.setvariable variable=dockerImageMatrixFedoraRpm;isOutput=true;]$docker_image_matrix_fedora_rpm" name: setDockerVar - script: | echo "Docker Build Number: " @@ -48,4 +52,5 @@ jobs: echo $(setDockerVar.dockerImageMatrixUbuntuDeb) echo $(setDockerVar.macOSBuilders) echo $(setDockerVar.dockerImageMatrixSourcePackageBuilders) + echo $(setDockerVar.dockerImageMatrixFedoraRpm) name: echoDockerVar diff --git a/.ci/templates/job-gnuradio-grettus-build-src.yml b/.ci/templates/job-gnuradio-grettus-build-src.yml index 99ffa46b5..9a5570e01 100644 --- a/.ci/templates/job-gnuradio-grettus-build-src.yml +++ b/.ci/templates/job-gnuradio-grettus-build-src.yml @@ -17,6 +17,7 @@ jobs: 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'] ] + dockerImageMatrixFedoraRpm: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixFedoraRpm'] ] 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 ebe6a68bc..fd99a79de 100644 --- a/.ci/templates/job-uhd-build-installer.yml +++ b/.ci/templates/job-uhd-build-installer.yml @@ -2,16 +2,20 @@ parameters: - name: 'toolset' type: string values: + - fedora_rpm - make - msbuild - ubuntu_deb - name: 'installer' type: string values: - - rpm # make + - rpm # fedora_rpm - tar # make - nsis # msbuild - deb # ubuntu_deb +- name: releaseBinaries + type: boolean + default: false jobs: - job: build_uhd_installer_${{ parameters.toolset }} @@ -26,6 +30,7 @@ jobs: 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'] ] + dockerImageMatrixFedoraRpm: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixFedoraRpm'] ] pool: ${{ if eq(parameters.toolset, 'msbuild') }}: name: de-dre-lab @@ -46,6 +51,8 @@ jobs: matrix: $[ variables.dockerImageMatrixWin ] ${{ if and(eq(parameters.toolset, 'ubuntu_deb'), eq(parameters.installer, 'deb')) }}: matrix: $[ variables.dockerImageMatrixUbuntuDeb ] + ${{ if and(eq(parameters.toolset, 'fedora_rpm'), eq(parameters.installer, 'rpm')) }}: + matrix: $[ variables.dockerImageMatrixFedoraRpm ] container: image: '$(dockerImagePrefix)$(DockerImageName):$(dockerBuildNumber)' endpoint: 'Docker / Artifactory - rnd-builds-local' @@ -57,13 +64,20 @@ jobs: clean: true - download: uhd_build_docker_container + - ${{ if eq(parameters.toolset, 'fedora_rpm') }}: + - template: steps-build-uhd-installer-fedora-rpm.yml + parameters: + uhdSrcDir: $(Build.SourcesDirectory) + uhdInstallerDir: $(Build.BinariesDirectory)/uhddev-installer + fedoraReleaseName: $(fedoraReleaseName) + releaseBinaries: ${{ parameters.releaseBinaries }} - ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: - template: steps-build-uhd-installer-ubuntu-deb.yml parameters: uhdSrcDir: $(Build.SourcesDirectory) uhdInstallerDir: $(Build.BinariesDirectory)/uhddev-installer ubuntuReleaseName: $(ubuntuReleaseName) - - ${{ if ne(parameters.toolset, 'ubuntu_deb') }}: + - ${{ if and(ne(parameters.toolset, 'ubuntu_deb'), ne(parameters.toolset, 'fedora_rpm')) }}: - download: current artifact: uhddev-$(buildOSName)-${{ parameters.toolset }} displayName: Download pipeline artifact uhddev-$(buildOSName)-${{ parameters.toolset }} diff --git a/.ci/templates/job-uhd-build-src.yml b/.ci/templates/job-uhd-build-src.yml index b894b88bc..a09047e1b 100644 --- a/.ci/templates/job-uhd-build-src.yml +++ b/.ci/templates/job-uhd-build-src.yml @@ -26,6 +26,7 @@ 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'] ] + dockerImageMatrixFedoraRpm: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixFedoraRpm'] ] macOSBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.macOSBuilders'] ] dockerImageMatrixSourcePackageBuilders: $[ dependencies.get_latest_uhd_docker.outputs['setDockerVar.dockerImageMatrixSourcePackageBuilders'] ] pool: diff --git a/.ci/templates/stages-uhd-pipeline.yml b/.ci/templates/stages-uhd-pipeline.yml index 401ea561f..effa25014 100644 --- a/.ci/templates/stages-uhd-pipeline.yml +++ b/.ci/templates/stages-uhd-pipeline.yml @@ -190,8 +190,8 @@ stages: parameters: toolset: make -- stage: build_uhd_installer_stage_linux - displayName: Build UHD Installers Linux +- stage: build_uhd_installer_stage_ubuntu + displayName: Build UHD Installers Ubuntu dependsOn: build_uhd_stage_linux jobs: - template: job-get-latest-uhd-docker.yml @@ -200,6 +200,17 @@ stages: toolset: ubuntu_deb installer: deb +- stage: build_uhd_installer_stage_fedora + displayName: Build UHD Installers Fedora + dependsOn: build_uhd_stage_linux + jobs: + - template: job-get-latest-uhd-docker.yml + - template: job-uhd-build-installer.yml + parameters: + toolset: fedora_rpm + installer: rpm + releaseBinaries: ${{ parameters.release_binaries }} + - stage: build_uhd_installer_stage_win displayName: Build UHD Installers Windows dependsOn: build_uhd_stage_win diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml index 74379a601..1a9ad6eab 100644 --- a/.ci/uhd-build-docker-container.yml +++ b/.ci/uhd-build-docker-container.yml @@ -63,6 +63,12 @@ variables: 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}, 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204','ubuntuReleaseName':'jammy'}}" +- name: fedoraRpmDockerImages + # Match with Fedora images in linuxDockerImages + value: + "{'Fedora-34-builder':{'buildOSName':'fedora34','dockerImageName':'uhd-builder-fedora34','fedoraReleaseName':'34'}, + 'Fedora-35-builder':{'buildOSName':'fedora35','dockerImageName':'uhd-builder-fedora35','fedoraReleaseName':'35'}}" + - name: macOSBuilders value: "{'macOS-12-x64':{'buildOSName':'macOS-12-x64', 'macOSVersionDemand':'12', 'macOSArchDemand': 'X64'}}" @@ -218,6 +224,7 @@ jobs: echo "${{ variables.ubuntuDebDockerImages }}" >> $(UHDPipelineDockerImageArtifactName) echo "${{ variables.macOSBuilders }}" >> $(UHDPipelineDockerImageArtifactName) echo "${{ variables.sourcePackageBuilders }}" >> $(UHDPipelineDockerImageArtifactName) + echo "${{ variables.fedoraRpmDockerImages }}" >> $(UHDPipelineDockerImageArtifactName) displayName: Generate created image list - task: PublishPipelineArtifact@1 inputs: |