Browse Source

Merge "Force qemu emulation in CI and add dmidecode command to logs" into stable/rocky

changes/06/675906/2
Zuul 1 month ago
parent
commit
b347ea404b
4 changed files with 4 additions and 0 deletions
  1. 1
    0
      tests/scenario001.sh
  2. 1
    0
      tests/scenario002.sh
  3. 1
    0
      tests/scenario003.sh
  4. 1
    0
      tools/copy-logs.sh

+ 1
- 0
tests/scenario001.sh View File

@@ -39,6 +39,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
39 39
           --os-neutron-l2-agent=ovn \
40 40
           --os-neutron-ml2-type-drivers="geneve,flat" \
41 41
           --os-neutron-ml2-tenant-network-types="geneve" \
42
+          --nova-libvirt-virt-type=qemu \
42 43
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
43 44
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
44 45
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \

+ 1
- 0
tests/scenario002.sh View File

@@ -40,6 +40,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
40 40
           --os-neutron-vpnaas-install=n \
41 41
           --os-sahara-install=y \
42 42
           --os-trove-install=y \
43
+          --nova-libvirt-virt-type=qemu \
43 44
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
44 45
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
45 46
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \

+ 1
- 0
tests/scenario003.sh View File

@@ -39,6 +39,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
39 39
           --os-heat-install=y \
40 40
           --os-magnum-install=y \
41 41
           --os-panko-install=y \
42
+          --nova-libvirt-virt-type=qemu \
42 43
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
43 44
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
44 45
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \

+ 1
- 0
tools/copy-logs.sh View File

@@ -52,6 +52,7 @@ function get_diag_commands {
52 52
         'rpm -qa'
53 53
         'journalctl --no-pager'
54 54
         'ulimit -n'
55
+        'dmidecode'
55 56
     )
56 57
 
57 58
     echo "Installing required RPM packages..."

Loading…
Cancel
Save