diff options
author | Steven Koo <steven.koo@ni.com> | 2022-06-03 10:27:00 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-06-10 13:24:06 -0500 |
commit | 693ec038b66520b0f868cee0338d00e3eb766548 (patch) | |
tree | c0ff3c206d11bd8223b917ea6a45186e1358034f | |
parent | 0190ed14d9d3cb875c60672514b722d9e27f4a1f (diff) | |
download | uhd-693ec038b66520b0f868cee0338d00e3eb766548.tar.gz uhd-693ec038b66520b0f868cee0338d00e3eb766548.tar.bz2 uhd-693ec038b66520b0f868cee0338d00e3eb766548.zip |
ci: Add devtests to hardware-test-dev
This enables running the devtests without having to rebuild uhd,
typically for development purposes.
Signed-off-by: Steven Koo <steven.koo@ni.com>
-rw-r--r-- | .ci/templates/job-uhd-devtest-rhombus.yml | 4 | ||||
-rw-r--r-- | .ci/templates/job-uhd-devtest.yml | 16 | ||||
-rw-r--r-- | .ci/uhd-hardware-test-dev.yml | 15 |
3 files changed, 32 insertions, 3 deletions
diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml index 71c0a01dc..a05f47644 100644 --- a/.ci/templates/job-uhd-devtest-rhombus.yml +++ b/.ci/templates/job-uhd-devtest-rhombus.yml @@ -5,6 +5,9 @@ parameters: - ubuntu2004 - name: uhdSrcDir type: string +- name: uhdArtifactSource + type: string + default: current jobs: - template: job-uhd-devtest.yml @@ -14,6 +17,7 @@ jobs: knownHost: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE+SZhHi7YOvHW6xmVGhhZGLtqlZoPkOqGdr5WqnmLBN root@ubuntu' toolset: 'make' uhdSrcDir: '${{ parameters.uhdSrcDir }}' + uhdArtifactSource: '${{ parameters.uhdArtifactSource }}' redisHost: 'sdr-rhombus' dutMatrix: rhombus-x300-UBX-0 XG: diff --git a/.ci/templates/job-uhd-devtest.yml b/.ci/templates/job-uhd-devtest.yml index c217fce01..2febdbbcf 100644 --- a/.ci/templates/job-uhd-devtest.yml +++ b/.ci/templates/job-uhd-devtest.yml @@ -13,6 +13,8 @@ parameters: - make - name: uhdSrcDir type: string +- name: uhdArtifactSource + type: string - name: redisHost type: string - name: dutMatrix @@ -44,13 +46,21 @@ jobs: sshPublicKey: '$(ettus_ssh_pubkey)' sshKeySecureFile: 'id_rsa.ettus' - - download: current + - script: | + if [ "${{ parameters.uhdArtifactSource }}" = "current" ]; then + echo '##vso[task.setvariable variable=uhd_artifact_directory]'$(Agent.BuildDirectory) + else + echo '##vso[task.setvariable variable=uhd_artifact_directory]'$(Agent.BuildDirectory)/${{ parameters.uhdArtifactSource }} + fi + displayName: Set uhddev pipeline artifact location + + - download: ${{ parameters.uhdArtifactSource }} artifact: uhddev-${{ parameters.testOS }}-${{ parameters.toolset }} - displayName: Download pipeline artifact ${{ parameters.testOS }}-${{ parameters.toolset }} + displayName: Download uhddev-${{ parameters.testOS }}-${{ parameters.toolset }} artifact - task: ExtractFiles@1 inputs: - archiveFilePatterns: $(Pipeline.Workspace)/uhddev-${{ parameters.testOS }}-${{ parameters.toolset }}/uhddev-${{ parameters.testOS }}-${{ parameters.toolset }}.tar.gz + archiveFilePatterns: $(uhd_artifact_directory)/uhddev-${{ parameters.testOS }}-${{ parameters.toolset }}/uhddev-${{ parameters.testOS }}-${{ parameters.toolset }}.tar.gz destinationFolder: $(Build.BinariesDirectory) cleanDestinationFolder: true diff --git a/.ci/uhd-hardware-test-dev.yml b/.ci/uhd-hardware-test-dev.yml index f12d451b4..c2d1d590c 100644 --- a/.ci/uhd-hardware-test-dev.yml +++ b/.ci/uhd-hardware-test-dev.yml @@ -11,6 +11,10 @@ parameters: type: boolean displayName: Run Streaming Tests default: false +- name: run_devtests + type: boolean + displayName: Run devtests + default: false - name: testLength type: string values: @@ -57,6 +61,7 @@ stages: parameters: testOS: ubuntu1804 uhdArtifactSource: uhd_mono_pipeline + - stage: test_streaming_stage displayName: Test UHD Streaming dependsOn: [] @@ -69,3 +74,13 @@ stages: uhdArtifactSource: uhd_mono_pipeline testLength: ${{ parameters.testLength }} +- stage: test_uhd_devtest + displayName: Test UHD Devtest + dependsOn: [] + condition: ${{ parameters.run_devtests }} + jobs: + - template: templates/job-uhd-devtest-rhombus.yml + parameters: + testOS: ubuntu2004 + uhdSrcDir: $(Build.SourcesDirectory) + uhdArtifactSource: uhd_mono_pipeline |