tests/nested/manual/install-volume-assignment: fix the pci addresses

canonical · Feb 1, 2025 · 127d9fd · 127d9fd
1 parent 99fd190
commit 127d9fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tests/lib/nested.sh b/tests/lib/nested.sh
@@ -1326,7 +1326,8 @@ nested_start_core_vm_unit() {
                 PARAM_TPM="$PARAM_TPM -device tpm-tis,tpmdev=tpm0"
             fi
         fi
-        PARAM_IMAGE="-drive file=$CURRENT_IMAGE,cache=none,format=raw,id=disk1,if=none -device virtio-blk-pci,drive=disk1,bootindex=1"
+        # addr=5 is to make tests/nested/manual/install-volume-assignment have stable address
+        PARAM_IMAGE="-drive file=$CURRENT_IMAGE,cache=none,format=raw,id=disk1,if=none -device virtio-blk-pci,drive=disk1,bootindex=1,addr=5"
     else
         PARAM_IMAGE="-drive file=$CURRENT_IMAGE,cache=none,format=raw,id=disk1,if=none -device ide-hd,drive=disk1"
     fi

diff --git a/tests/nested/manual/install-volume-assignment/task.yaml b/tests/nested/manual/install-volume-assignment/task.yaml
@@ -37,6 +37,8 @@ prepare: |
         device: /dev/disk/by-id/nvme0003
   - assignment-name: test-device
     assignment:
+      # FIXME: we should really not use those kind of paths, they are
+      # difficult to predict
       pc:
         device: /dev/disk/by-path/pci-0000:00:05.0
       backup:
@@ -72,8 +74,11 @@ execute: |
   BACKUP_VOLUME="$NESTED_IMAGES_DIR/$(nested_get_image_name_base core)-backup.img"
 
   # setup extra disk options for tests.nested
-  NESTED_PARAM_EXTRA="-drive file=$BACKUP_VOLUME,if=none,snapshot=off,format=raw,id=disk2 \
-      -device virtio-blk-pci,drive=disk2,serial=target"
+  params=(
+    "-drive" "file=${BACKUP_VOLUME},if=none,snapshot=off,format=raw,id=disk2"
+    "-device" "virtio-blk-pci,drive=disk2,addr=6"
+  )
+  NESTED_PARAM_EXTRA="${params[*]}"
 
   tests.nested create-vm core --extra-param "$NESTED_PARAM_EXTRA"