Skip to content

Commit

Permalink
Merge pull request #249 from canonical/noble-24.04-fix-failing-test-i…
Browse files Browse the repository at this point in the history
…perf

fix failing test vsock in checkbox provider
  • Loading branch information
mckees authored Oct 21, 2024
2 parents ce70b02 + 88488e0 commit 6c45975
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
10 changes: 10 additions & 0 deletions tests/checkbox/checkbox-provider-tdx/units/tests/jobs.pxu
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,18 @@ depends:
after:
requires:
executable.name == 'qemu-system-x86_64'
executable.name == 'iperf3'
command:
export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH
# The order of binary look-up:
# - test working folder
# - checkbox
# - provider
# - snaps binaries (/snap/bin)
# - host system
# so for iperf3, the binary from the checkbox snap will be used.
# however we want to use the one from tdx provider (that has vsock support)
export PATH=${SNAP}/usr/bin/:${PATH}
setup-env-and-run test_vsock_vm.py

id: tdx-guest/td-memory
Expand Down
5 changes: 5 additions & 0 deletions tests/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ passthrough:
configure:
command-chain: [bin/wrapper_local]

package-repositories:
- type: apt
ppa: kobuk-team/testing

parts:
checkbox-provider-tdx:
plugin: dump
Expand All @@ -88,6 +92,7 @@ parts:
- python3-pytest
- sshpass
- cpuid
- iperf-vsock
override-build: |
# the validation tool needs to access the to all checkbox providers
# we have to set the PROVIDERPATH to point to them
Expand Down

0 comments on commit 6c45975

Please sign in to comment.