From d9ac128a38b4c4d9632701ec681b68b7d42616d8 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 1 Dec 2020 16:53:08 +0530 Subject: [PATCH 01/16] Add custom config for CI tests Add custom config for CI tests Signed-off-by: Satheesh Rajendran --- config/wrapper/env.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/wrapper/env.conf b/config/wrapper/env.conf index 5b14d5a4..70f06c62 100644 --- a/config/wrapper/env.conf +++ b/config/wrapper/env.conf @@ -3,9 +3,9 @@ # (avocado-framework, '') -- Installs latest released version # ('avocado-framework', 80.0) -- Installs specificed version, make sure you change other entries aswell # ('avocado-framework', 'git+https://github.com/avocado-framework/avocado.git') -- Install version from the given git repo -base = [('avocado-framework', ''), ('avocado-framework-plugin-varianter-yaml-to-mux', '')] -kvm = [('avocado-framework-plugin-vt', '')] -optional = [('avocado-framework-plugin-result-html', '')] +base = [('avocado-framework', '83.0'), ('avocado-framework-plugin-varianter-yaml-to-mux', '83.0')] +kvm = [('avocado-framework-plugin-vt', 'git+https://github.com/sathnaga/avocado-vt@v83.0_ci')] +optional = [('avocado-framework-plugin-result-html', '83.0')] [tests] name = ['https://github.com/avocado-framework-tests/avocado-misc-tests.git'] From 984f6810259d3b315f996cc081001aef18fbfd5d Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 1 Dec 2020 17:17:26 +0530 Subject: [PATCH 02/16] Modify qemu binary path Qemu binary path gets changed in latest avocado-vt 83.0, let's change it accordingly. Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/upstream.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tests/guest/libvirt/upstream.cfg b/config/tests/guest/libvirt/upstream.cfg index da2afd09..88c1fa98 100644 --- a/config/tests/guest/libvirt/upstream.cfg +++ b/config/tests/guest/libvirt/upstream.cfg @@ -38,8 +38,8 @@ vcpu_cores=8 vcpu_threads=1 setvcpus_max = 8 vcpu_maxcpus = 8 -qemu_binary=/usr/share/avocado-plugins-vt/bin/qemu -emulator_path=/usr/share/avocado-plugins-vt/bin/qemu +qemu_binary=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 +emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 kernel=/home/kvmci/linux/vmlinux initrd='' use_serial_login=yes From 779edbee0ace515a2e3409e6f85cae0172272efc Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Fri, 4 Dec 2020 17:26:04 +0530 Subject: [PATCH 03/16] Update guest install config Update guest install config to adopt to fedora rawhide image Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/install.cfg | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/config/tests/guest/libvirt/install.cfg b/config/tests/guest/libvirt/install.cfg index 09a95134..e175da6b 100644 --- a/config/tests/guest/libvirt/install.cfg +++ b/config/tests/guest/libvirt/install.cfg @@ -7,7 +7,8 @@ vms = virt-tests-vm1 #Network nettype = bridge netdst = virbr0 -display = vnc +display = nographic +vga = none take_regular_screendumps = no keep_screendumps_on_error = no keep_screendumps = no @@ -28,12 +29,11 @@ only no_9p_export only no_pci_assignable only (image_backend=filesystem) only smallpages -smp = 32 -vcpu_cores = 4 -vcpu_threads = 8 +smp = 8 +vcpu_cores = 8 +vcpu_threads = 1 vcpu_sockets = 1 -# 32G -mem = 32768 +mem = 8192 only virtio_net only qcow2 only virtio_scsi @@ -44,10 +44,12 @@ variants: - guest_install: variants: - url: - only CentOS.7.2.ppc64le + Fedora.devel.ppc64le: + url = https://dl.fedoraproject.org/pub/fedora-secondary/development/rawhide/Server/ppc64le/os + only Fedora.devel.ppc64le only unattended_install.url.http_ks.default_install.aio_native - cdrom: - no CentOS.7.2.ppc64le + no Fedora.devel.ppc64le only unattended_install.cdrom.http_ks.default_install.aio_native - guest_dep_install: reboot_before_test = no From 8f5d8ee7912570b30a3c9df60ea3e9955566ee74 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Mon, 3 Aug 2020 13:26:14 +0530 Subject: [PATCH 04/16] Add kvm test config to run tests for L2 nested guest Add kvm test config to run tests for L2 nested guest Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/nested.cfg | 287 ++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 config/tests/guest/libvirt/nested.cfg diff --git a/config/tests/guest/libvirt/nested.cfg b/config/tests/guest/libvirt/nested.cfg new file mode 100644 index 00000000..df1b1bd4 --- /dev/null +++ b/config/tests/guest/libvirt/nested.cfg @@ -0,0 +1,287 @@ +include tests-shared.cfg +username = root +password = 123456 +main_vm = vm1 +vms = vm1 +nettype = bridge +netdst=virbr0 +display = nographic +take_regular_screendumps = no +keep_screendumps_on_error = no +keep_screendumps = no +store_vm_register = no +restore_image_after_testing=no +vga=none +virt_install_binary = /usr/bin/virt-install +hvm_or_pv = hvm +machine_type = pseries +only bridge +no xen, lxc, esx, ovmf +#Filterout unwanted disk types +no qed,qcow2v3,raw_dd,vmdk, usb2 +only no_virtio_rng +only smp2 +only no_9p_export +only no_pci_assignable +only (image_backend=filesystem) +create_vm_libvirt=yes +kill_vm=yes +kill_vm_libvirt=yes +env_cleanup=yes +mem=8192 +smp=8 +threads=1 +cores=8 +sockets=1 +vcpu_sockets=1 +vcpu_cores=8 +vcpu_threads=1 +setvcpus_max = 8 +vcpu_maxcpus = 8 +qemu_binary=/usr/share/avocado-plugins-vt/bin/qemu +emulator_path=/usr/share/avocado-plugins-vt/bin/qemu +kernel=/tmp/linux/vmlinux +initrd='' +use_serial_login=yes +test_timeout = 72000 + +variants: + - prepare_env: + only virtio_net + only qcow2 + only smalpages + only virtio_scsi + pre_command = "rm -rf /tmp/linux;git clone --depth 1 https://github.com/torvalds/linux /tmp/linux && cd /tmp/linux && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" + kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' + no virsh.boot + only boot + + - vmstart: + only boot + no virsh.boot + only virtio_net + only qcow2 + variants: + - @: + - with_numa: + only with_smt1 + numa=yes + smp=8 + threads=1 + cores=8 + sockets=1 + setvcpus_max = 8 + vcpu_maxcpus = 8 + vcpu_cores = 8 + vcpu_threads = 1 + guest_numa_nodes="node0 node1 node2 node3" + variants: + - symmetric_nodes: + numa_mem_node0="2097152" + numa_cpus_node0="0-1" + numa_nodeid_node0="0" + numa_mem_node1="2097152" + numa_cpus_node1="2-3" + numa_nodeid_node1="1" + numa_mem_node2="2097152" + numa_cpus_node2="4-5" + numa_nodeid_node2="2" + numa_mem_node3="2097152" + numa_cpus_node3="6-7" + numa_nodeid_node3="3" + - asymmetric_nodes: + numa_mem_node0="1048576" + numa_cpus_node0="1,3,7" + numa_nodeid_node0="0" + numa_mem_node1="2097152" + numa_cpus_node1="0,4-5" + numa_nodeid_node1="1" + numa_mem_node2="2097152" + numa_cpus_node2="2" + numa_nodeid_node2="2" + numa_mem_node3="3145728" + numa_cpus_node3="6" + numa_nodeid_node3="3" + variants: + - @: + - with_smt1: + smp=8 + threads=1 + cores=8 + sockets=1 + setvcpus_max=8 + vcpu_maxcpus=8 + vcpu_cores=8 + vcpu_threads=1 + vcpu_sockets=1 + - with_smt2: + smp=8 + threads=2 + cores=4 + sockets=1 + setvcpus_max=8 + vcpu_maxcpus=8 + vcpu_cores=4 + vcpu_threads=2 + vcpu_sockets=1 + - with_smt4: + smp=8 + threads=4 + cores=2 + sockets=1 + setvcpus_max=8 + vcpu_maxcpus=8 + vcpu_cores=2 + vcpu_threads=4 + vcpu_sockets=1 + - with_smt8: + smp=8 + threads=4 + cores=2 + sockets=1 + setvcpus_max=8 + vcpu_maxcpus=8 + vcpu_cores=2 + vcpu_threads=4 + vcpu_sockets=1 + - with_lowmem: + no with_numa + mem=2048 + - with_singlecpu: + only with_smt1 + smp=1 + threads=1 + cores=1 + sockets=1 + setvcpus_max=1 + vcpu_maxcpus=1 + vcpu_cores=1 + vcpu_threads=1 + vcpu_sockets=1 + variants: + - @: + - with_intc: + only with_smt4 + variants: + - xics: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=xics" + - xive: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=xive" + - dual: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=dual" + - xics_kernel_irqchip_off: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=xics,kernel-irqchip=off" + - xive_kernel_irqchip_off: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=xive,kernel-irqchip=off" + - dual_kernel_irqchip_off: + virtinstall_qemu_cmdline_vm1=" -M pseries,ic-mode=dual,kernel-irqchip=off" + - with_vsmt: + mem = 20480 + no with_intc,mem_merge,with_numa + only with_smt1 + vms = "vm1" + cores_vm1=1 + threads_vm1=8 + sockets=1 + vcpu_cores_vm1=1 + vcpu_threads_vm1=8 + vcpu_sockets_vm1=1 + virtinstall_qemu_cmdline_vm1=" -M pseries,vsmt=8" + - with_nested_cap: + no with_vsmt,with_intc,mem_merge + only with_smt4,with_smt8 + virtinstall_qemu_cmdline_vm1=" -M pseries,cap-nested-hv=True" + variants: + - with_virtio_scsi: + kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' + no with_virtio_blk + only virtio_scsi + - with_virtio_blk: + kernel_args='root=/dev/vda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' + no with_virtio_scsi + only virtio_blk + + - vm: + kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' + only virtio_scsi + only virtio_net + only qcow2 + variants: + - guesttests: + variants: + - memory: + only avocado_guest.memhotplug,avocado_guest.eatmemory,avocado_guest.memintegrity + - generic: + only smallpages + only avocado_guest.ltp,avocado_guest.kselftest + - cpu: + only smallpages + vcpu_cores = 4 + vcpu_threads = 8 + vcpu_sockets = 1 + vcpu_maxcpus = 32 + only avocado_guest.ebizzy,avocado_guest.ppc64_cpu_test + - io: + vcpu_cores = 16 + vcpu_threads = 2 + vcpu_sockets = 1 + vcpu_maxcpus = 32 + only avocado_guest.fiotest + + - guestdump: + only virsh.dump.positive_test.non_acl.live_dump + - diskhotplug: + at_dt_disk_device_target = sdb + only virsh.attach_detach_disk_matrix..at_option_live + no dt_option_live_config,dt_option_config,dt_option_default,dt_option_live_config,at_okay_dt_error,at_error_dt_error,pre_vm_state_shutoff,pre_vm_state_paused,pre_vm_state_transient,dt_option_current + - memoryhotplug: + # FIXME + only libvirt_mem.positive_test.memory.hot.unplug.max_slots.with_rand_reboot + - vcpuhotplug: + start_vm = yes + test_itr = 2 + mem = 81920 + vcpu_max_timeout = 480 + vcpu_sockets = 1 + vcpu_maxcpus = 64 + topology_correction = "no" + variants: + - 1thread: + no hugepages + vcpu_cores = 64 + smp = 1 + vcpu_threads = 1 + vcpu_current_num = 1 + vcpu_plug_num = 64 + vcpu_unplug_num = 1 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 2threads: + no hugepages + smp = 2 + vcpu_cores = 32 + vcpu_threads = 2 + vcpu_current_num = 2 + vcpu_plug_num = 64 + vcpu_unplug_num = 2 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 4threads: + smp = 4 + vcpu_cores = 16 + vcpu_threads = 4 + vcpu_current_num = 4 + vcpu_plug_num = 64 + vcpu_unplug_num = 4 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 8threads: + no hugepages + smp = 8 + vcpu_cores = 8 + vcpu_threads = 8 + vcpu_current_num = 8 + vcpu_plug_num = 64 + vcpu_unplug_num = 8 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu From bb628ea79a3cc365059f2f72121433aa7cef0f46 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 26 May 2020 19:45:51 +0530 Subject: [PATCH 05/16] Add Upstream test config for svm guest Add Upstream test config for svm guest Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/pef.cfg | 262 +++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 config/tests/guest/libvirt/pef.cfg diff --git a/config/tests/guest/libvirt/pef.cfg b/config/tests/guest/libvirt/pef.cfg new file mode 100644 index 00000000..528c16b6 --- /dev/null +++ b/config/tests/guest/libvirt/pef.cfg @@ -0,0 +1,262 @@ +# Expected the guest kernel cmdline is updated with svm=on xive=off +# File reserved for test runner (./run) use, don't modify. +include tests-shared.cfg +username = root +password = 123456 +main_vm = vm1 +vms = vm1 +vm_type = libvirt +virt_install_binary = /usr/bin/virt-install +qemu_img_binary = /usr/bin/qemu-img +hvm_or_pv = hvm +machine_type = pseries +use_os_variant = no +use_os_type = no +only bridge +only smp2 +only no_9p_export +only no_virtio_rng +only no_pci_assignable +only (image_backend=filesystem) +only smallpages +kill_vm = yes +kill_vm_libvirt = yes +env_cleanup = yes +create_vm_libvirt = yes +qemu_binary = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 +emulator_path = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 +bios_path = /usr/share/avocado-plugins-vt/bin/install_root/share/qemu/slof.bin +vga = None +display = nographic +take_regular_screendumps = no +backup_image_before_testing = no +avocado_reinstall = False +test_timeout = 6000000 +virtinstall_qemu_cmdline=" -global virtio-scsi-pci.disable-legacy=on -global virtio-scsi-pci.disable-modern=off -global virtio-scsi-pci.iommu_platform=on -global virtio-blk-pci.disable-legacy=on -global virtio-blk-pci.disable-modern=off -global virtio-blk-pci.iommu_platform=on -global virtio-net-pci.disable-legacy=on -global virtio-net-pci.disable-modern=off -global virtio-net-pci.iommu_platform=on -global virtio-serial-pci.disable-legacy=on -global virtio-serial-pci.disable-modern=off -global virtio-serial-pci.iommu_platform=on -global virtio-balloon-pci.disable-legacy=on -global virtio-balloon-pci.disable-modern=off -global virtio-balloon-pci.iommu_platform=on" +only qcow2 +only virtio_scsi +only virtio_net +mem = 8192 + +variants: + - secure: + smp = 32 + mem = 81920 + vcpu_cores = 32 + vcpu_threads = 1 + vcpu_sockets = 1 + vcpu_maxcpus = 32 + variants: + - singlevm: + variants: + - reboottest: + only io-github-autotest-qemu.reboot + reboot_count = 60 + variants: + - 512M: + smp = 1 + vcpu_maxcpus = 1 + vcpu_threads = 1 + vcpu_maxcpus = 1 + vcpu_cores = 1 + mem = 512 + - 1G: + mem = 1024 + - 2G: + mem = 2048 + - 4G: + mem = 4096 + - 8G: + mem = 8192 + - 16G: + mem = 16384 + - 32G: + vcpu_cores = 16 + smp = 16 + vcpu_maxcpus = 16 + mem = 32768 + - 64G: + vcpu_cores = 16 + smp = 16 + vcpu_maxcpus = 16 + mem = 65536 + login_timeout = 600 + - 80G: + vcpu_cores = 32 + smp = 32 + vcpu_maxcpus = 32 + mem = 81920 + login_timeout = 1200 + # this config for Host with 128 SVM memory + - 110G: + vcpu_cores = 32 + smp = 32 + vcpu_maxcpus = 32 + mem = 112640 + login_timeout = 1800 + - vcpuhotplug: + start_vm = yes + test_itr = 2 + vcpu_max_timeout = 480 + vcpu_sockets = 1 + vcpu_maxcpus = 64 + topology_correction = "no" + variants: + - 1thread: + vcpu_cores = 64 + smp = 1 + vcpu_threads = 1 + vcpu_current_num = 1 + vcpu_plug_num = 64 + vcpu_unplug_num = 1 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 2threads: + smp = 2 + vcpu_cores = 32 + vcpu_threads = 2 + vcpu_current_num = 2 + vcpu_plug_num = 64 + vcpu_unplug_num = 2 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 4threads: + smp = 4 + vcpu_cores = 16 + vcpu_threads = 4 + vcpu_current_num = 4 + vcpu_plug_num = 64 + vcpu_unplug_num = 4 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - 8threads: + smp = 8 + vcpu_cores = 8 + vcpu_threads = 8 + vcpu_current_num = 8 + vcpu_plug_num = 64 + vcpu_unplug_num = 8 + vcpu_max_num = 64 + only libvirt_vcpu_plug_unplug..with_maxvcpu + - memoryhotplug: + only libvirt_mem.positive_test.memory.hot.unplug.max_slots.with_rand_reboot + - guestdump: + only virsh.dump.positive_test.non_acl.live_dump + - diskhotplug: + only virsh.attach_detach_disk.detach_disk.normal_test.host_block_vm_id + - guesttests: + variants: + - memory: + only avocado_guest.memhotplug,avocado_guest.eatmemory,avocado_guest.memintegrity + - generic: + only avocado_guest.ltp,avocado_guest.kselftest + - cpu: + vcpu_cores = 4 + vcpu_threads = 8 + vcpu_sockets = 1 + vcpu_maxcpus = 32 + only avocado_guest.ebizzy,avocado_guest.ppc64_cpu_test + - io: + vcpu_cores = 16 + vcpu_threads = 2 + vcpu_sockets = 1 + vcpu_maxcpus = 32 + only avocado_guest.fiotest + + - multi: + mem = 8192 + vms = "vm1 vm2 vm3 vm4" + drive_format_vm2=virtio + scsi_hba_vm2="" + libvirt_controller_vm2="" + smp_vm1 = 16 + vcpu_cores_vm1 = 16 + vcpu_threads_vm1 = 1 + vcpu_sockets_vm1 = 1 + vcpu_maxcpus_vm1 = 16 + smp_vm2 = 16 + vcpu_cores_vm2 = 8 + vcpu_threads_vm2 = 2 + vcpu_sockets_vm2 = 1 + vcpu_maxcpus_vm2 = 16 + smp_vm3 = 16 + vcpu_cores_vm3 = 4 + vcpu_threads_vm3 = 4 + vcpu_sockets_vm3 = 1 + vcpu_maxcpus_vm3 = 16 + smp_vm4 = 16 + vcpu_cores_vm4 = 2 + vcpu_threads_vm4 = 8 + vcpu_sockets_vm4 = 1 + vcpu_maxcpus_vm4 = 16 + variants: + - reboottest: + guest_stress = no + host_stress = no + host_stress_events = "" + stress_events = "reboot" + stress_itrs = 60 + test_timeout = 6000000 + event_sleep_time = 30 + itr_sleep_time = 30 + only multivm_cpustress.custom_host_events.custom_vm_events + - cpupin_withstress: + guest_stress = yes + host_stress = no + host_stress_events = "" + stress_events = "vcpupin,emulatorpin" + stress_itrs = 500 + test_timeout = 6000000 + event_sleep_time = 30 + itr_sleep_time = 30 + only multivm_cpustress.custom_host_events.custom_vm_events + + - nonsecure: + smp = 80 + mem = 81920 + vcpu_cores = 80 + vcpu_threads = 1 + vcpu_sockets = 1 + vcpu_maxcpus = 80 + variants: + - singlevm: + variants: + - reboottest: + serial_login = yes + only io-github-autotest-qemu.reboot + reboot_count = 6 + - multivm: + mem = 8192 + vms = "vm1 vm2 vm3 vm4" + smp_vm1 = 16 + vcpu_cores_vm1 = 16 + vcpu_threads_vm1 = 1 + vcpu_sockets_vm1 = 1 + vcpu_maxcpus_vm1 = 16 + smp_vm2 = 16 + vcpu_cores_vm2 = 8 + vcpu_threads_vm2 = 2 + vcpu_sockets_vm2 = 1 + vcpu_maxcpus_vm2 = 16 + smp_vm3 = 16 + vcpu_cores_vm3 = 4 + vcpu_threads_vm3 = 4 + vcpu_sockets_vm3 = 1 + vcpu_maxcpus_vm3 = 16 + smp_vm4 = 16 + vcpu_cores_vm4 = 2 + vcpu_threads_vm4 = 8 + vcpu_sockets_vm4 = 1 + vcpu_maxcpus_vm4 = 16 + variants: + - reboottest: + guest_stress = no + host_stress = no + host_stress_events = "" + stress_events = "reboot" + stress_itrs = 6 + test_timeout = 6000000 + event_sleep_time = 30 + itr_sleep_time = 30 + only multivm_cpustress.custom_host_events.custom_vm_events + From fa2000aed2db60f849d8a8a62ce56415fbe90c3c Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 15 Dec 2020 11:53:06 +0530 Subject: [PATCH 06/16] Update to pef config Update pef config to reflect the guest image name and additional qemu options and updated qemu path. Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/pef.cfg | 90 +++++++++++++++++------------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/config/tests/guest/libvirt/pef.cfg b/config/tests/guest/libvirt/pef.cfg index 528c16b6..5faee65f 100644 --- a/config/tests/guest/libvirt/pef.cfg +++ b/config/tests/guest/libvirt/pef.cfg @@ -1,5 +1,3 @@ -# Expected the guest kernel cmdline is updated with svm=on xive=off -# File reserved for test runner (./run) use, don't modify. include tests-shared.cfg username = root password = 123456 @@ -23,23 +21,30 @@ kill_vm = yes kill_vm_libvirt = yes env_cleanup = yes create_vm_libvirt = yes -qemu_binary = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 -emulator_path = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 -bios_path = /usr/share/avocado-plugins-vt/bin/install_root/share/qemu/slof.bin vga = None display = nographic take_regular_screendumps = no backup_image_before_testing = no avocado_reinstall = False -test_timeout = 6000000 -virtinstall_qemu_cmdline=" -global virtio-scsi-pci.disable-legacy=on -global virtio-scsi-pci.disable-modern=off -global virtio-scsi-pci.iommu_platform=on -global virtio-blk-pci.disable-legacy=on -global virtio-blk-pci.disable-modern=off -global virtio-blk-pci.iommu_platform=on -global virtio-net-pci.disable-legacy=on -global virtio-net-pci.disable-modern=off -global virtio-net-pci.iommu_platform=on -global virtio-serial-pci.disable-legacy=on -global virtio-serial-pci.disable-modern=off -global virtio-serial-pci.iommu_platform=on -global virtio-balloon-pci.disable-legacy=on -global virtio-balloon-pci.disable-modern=off -global virtio-balloon-pci.iommu_platform=on" +test_timeout = 3600000 only qcow2 only virtio_scsi only virtio_net mem = 8192 +qemu_binary = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 +emulator_path = /usr/share/avocado-plugins-vt/bin/install_root/bin/qemu-system-ppc64 +bios_path = /usr/share/avocado-plugins-vt/bin/install_root/share/qemu/slof.bin variants: - secure: + # this guest image has modified initrd image using svm-tools + # and addtional kernel cmdline option svm=on xive=off to enable + # svm functionality. + image_name = images/rhel8-devel-ppc64le-svm + # https://bugzilla.linux.ibm.com/show_bug.cgi?id=186761 + tpm_device_path = "/dev/tpmrm0" + tpm_model = "spapr-tpm-proxy" + virtinstall_qemu_cmdline=" -M pseries,x-svm-allowed=on -global virtio-scsi-pci.disable-legacy=on -global virtio-scsi-pci.disable-modern=off -global virtio-scsi-pci.iommu_platform=on -global virtio-blk-pci.disable-legacy=on -global virtio-blk-pci.disable-modern=off -global virtio-blk-pci.iommu_platform=on -global virtio-net-pci.disable-legacy=on -global virtio-net-pci.disable-modern=off -global virtio-net-pci.iommu_platform=on -global virtio-serial-pci.disable-legacy=on -global virtio-serial-pci.disable-modern=off -global virtio-serial-pci.iommu_platform=on -global virtio-balloon-pci.disable-legacy=on -global virtio-balloon-pci.disable-modern=off -global virtio-balloon-pci.iommu_platform=on" smp = 32 mem = 81920 vcpu_cores = 32 @@ -51,7 +56,7 @@ variants: variants: - reboottest: only io-github-autotest-qemu.reboot - reboot_count = 60 + reboot_count = 100 variants: - 512M: smp = 1 @@ -80,20 +85,14 @@ variants: smp = 16 vcpu_maxcpus = 16 mem = 65536 - login_timeout = 600 - - 80G: - vcpu_cores = 32 - smp = 32 - vcpu_maxcpus = 32 - mem = 81920 - login_timeout = 1200 - # this config for Host with 128 SVM memory - - 110G: + login_timeout = 450 + - 128G: vcpu_cores = 32 smp = 32 vcpu_maxcpus = 32 - mem = 112640 - login_timeout = 1800 + mem = 131072 + login_timeout = 660 + - vcpuhotplug: start_vm = yes test_itr = 2 @@ -139,17 +138,24 @@ variants: vcpu_max_num = 64 only libvirt_vcpu_plug_unplug..with_maxvcpu - memoryhotplug: + attach_times = 15 only libvirt_mem.positive_test.memory.hot.unplug.max_slots.with_rand_reboot - guestdump: only virsh.dump.positive_test.non_acl.live_dump - diskhotplug: - only virsh.attach_detach_disk.detach_disk.normal_test.host_block_vm_id + at_dt_disk_device_target = sdb + only virsh.attach_detach_disk_matrix..at_option_live + no dt_option_live_config,dt_option_config,dt_option_default,dt_option_live_config,at_okay_dt_error,at_error_dt_error,pre_vm_state_shutoff,pre_vm_state_paused,pre_vm_state_transient,dt_option_current - guesttests: variants: - memory: + mem = 8192 only avocado_guest.memhotplug,avocado_guest.eatmemory,avocado_guest.memintegrity - generic: - only avocado_guest.ltp,avocado_guest.kselftest + test_timeout = 600000 + only avocado_guest.ltp + # kself test needs a src rpm for distro + #only avocado_guest.ltp,avocado_guest.kselftest - cpu: vcpu_cores = 4 vcpu_threads = 8 @@ -163,40 +169,47 @@ variants: vcpu_maxcpus = 32 only avocado_guest.fiotest - - multi: + - multivm: + # this has to set based on host svm memory, in this case we have 512G svm mem on host + #mem = 4096 mem = 8192 + #mem = 12288 + #mem = 65536 + login_timeout = 500 vms = "vm1 vm2 vm3 vm4" + vms = "vm1" drive_format_vm2=virtio scsi_hba_vm2="" libvirt_controller_vm2="" - smp_vm1 = 16 - vcpu_cores_vm1 = 16 + smp_vm1 = 32 + vcpu_cores_vm1 = 32 vcpu_threads_vm1 = 1 vcpu_sockets_vm1 = 1 - vcpu_maxcpus_vm1 = 16 - smp_vm2 = 16 - vcpu_cores_vm2 = 8 + vcpu_maxcpus_vm1 = 32 + smp_vm2 = 32 + vcpu_cores_vm2 = 16 vcpu_threads_vm2 = 2 vcpu_sockets_vm2 = 1 - vcpu_maxcpus_vm2 = 16 - smp_vm3 = 16 - vcpu_cores_vm3 = 4 + vcpu_maxcpus_vm2 = 32 + smp_vm3 = 32 + vcpu_cores_vm3 = 8 vcpu_threads_vm3 = 4 vcpu_sockets_vm3 = 1 - vcpu_maxcpus_vm3 = 16 - smp_vm4 = 16 - vcpu_cores_vm4 = 2 + vcpu_maxcpus_vm3 = 32 + smp_vm4 = 32 + vcpu_cores_vm4 = 4 vcpu_threads_vm4 = 8 vcpu_sockets_vm4 = 1 - vcpu_maxcpus_vm4 = 16 + vcpu_maxcpus_vm4 = 32 + reboot_count = 6 variants: - reboottest: guest_stress = no host_stress = no host_stress_events = "" stress_events = "reboot" - stress_itrs = 60 - test_timeout = 6000000 + stress_itrs = 100 + test_timeout = 1800000 event_sleep_time = 30 itr_sleep_time = 30 only multivm_cpustress.custom_host_events.custom_vm_events @@ -212,6 +225,8 @@ variants: only multivm_cpustress.custom_host_events.custom_vm_events - nonsecure: + image_name = images/rhel8-devel-ppc64le + virtinstall_qemu_cmdline=" -M pseries,x-svm-allowed=off -global virtio-scsi-pci.disable-legacy=on -global virtio-scsi-pci.disable-modern=off -global virtio-scsi-pci.iommu_platform=on -global virtio-blk-pci.disable-legacy=on -global virtio-blk-pci.disable-modern=off -global virtio-blk-pci.iommu_platform=on -global virtio-net-pci.disable-legacy=on -global virtio-net-pci.disable-modern=off -global virtio-net-pci.iommu_platform=on -global virtio-serial-pci.disable-legacy=on -global virtio-serial-pci.disable-modern=off -global virtio-serial-pci.iommu_platform=on -global virtio-balloon-pci.disable-legacy=on -global virtio-balloon-pci.disable-modern=off -global virtio-balloon-pci.iommu_platform=on" smp = 80 mem = 81920 vcpu_cores = 80 @@ -222,7 +237,6 @@ variants: - singlevm: variants: - reboottest: - serial_login = yes only io-github-autotest-qemu.reboot reboot_count = 6 - multivm: @@ -259,4 +273,4 @@ variants: event_sleep_time = 30 itr_sleep_time = 30 only multivm_cpustress.custom_host_events.custom_vm_events - + From bc77daf407b7d314670f942a17e0a9ddba5904a4 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Fri, 18 Dec 2020 16:30:02 +0530 Subject: [PATCH 07/16] Update nested config Update nested config for kernel path and qemu path Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/nested.cfg | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/config/tests/guest/libvirt/nested.cfg b/config/tests/guest/libvirt/nested.cfg index df1b1bd4..6ad94b7d 100644 --- a/config/tests/guest/libvirt/nested.cfg +++ b/config/tests/guest/libvirt/nested.cfg @@ -38,23 +38,22 @@ vcpu_cores=8 vcpu_threads=1 setvcpus_max = 8 vcpu_maxcpus = 8 -qemu_binary=/usr/share/avocado-plugins-vt/bin/qemu -emulator_path=/usr/share/avocado-plugins-vt/bin/qemu -kernel=/tmp/linux/vmlinux +qemu_binary=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 +emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 +kernel=/home/epcci/linux/vmlinux initrd='' use_serial_login=yes test_timeout = 72000 variants: - - prepare_env: + - prepare_environ: only virtio_net only qcow2 only smalpages only virtio_scsi - pre_command = "rm -rf /tmp/linux;git clone --depth 1 https://github.com/torvalds/linux /tmp/linux && cd /tmp/linux && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" + pre_command = "rm -rf /home/epcci/linux;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/linux/ && cd /home/epcci/linux/vmlinux && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' - no virsh.boot - only boot + only guest_test.isa_serial_operations - vmstart: only boot From 319e7d23f8d6f0de585b178ef9957847dd8f4306 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Fri, 18 Dec 2020 16:32:03 +0530 Subject: [PATCH 08/16] Add L1 test config to run nested guests on L2 Add L1 test config to run nested guests on L2 Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/L1.cfg | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 config/tests/guest/libvirt/L1.cfg diff --git a/config/tests/guest/libvirt/L1.cfg b/config/tests/guest/libvirt/L1.cfg new file mode 100644 index 00000000..8b2c1f3d --- /dev/null +++ b/config/tests/guest/libvirt/L1.cfg @@ -0,0 +1,57 @@ +include tests-shared.cfg + +username = root +password = 123456 +main_vm = virt-tests-vm1 +vms = virt-tests-vm1 +#Network +nettype = bridge +netdst = virbr0 +display = nographic +vga = none +take_regular_screendumps = no +keep_screendumps_on_error = no +keep_screendumps = no +store_vm_register = no +virt_install_binary = /usr/bin/virt-install +qemu_img_binary = /usr/bin/qemu-img +hvm_or_pv = hvm +machine_type = pseries +only bridge +no xen, lxc, esx, ovmf +#Filterout unwanted disk types +no ide,xenblk,lsi_scsi,ahci,sd +no qed,qcow2v3,raw_dd,vmdk, usb2 +no e1000-82540em,e1000-82545em,e1000-82544gc,xennet,nic_custom +only no_virtio_rng +only smp2 +only no_9p_export +only no_pci_assignable +only (image_backend=filesystem) +only smallpages +smp = 144 +vcpu_cores = 18 +vcpu_threads = 8 +vcpu_sockets = 1 +mem = 131072 +only virtio_net +only qcow2 +only virtio_scsi +# User can change the disk as per need +image_size = 50G +create_vm_libvirt=yes +kill_vm_libvirt=yes +kill_vm=yes +env_cleanup=yes +backup_image_before_testing=no +restore_image_after_testing=no +kernel_args='root=/dev/sda3 rootflags=subvol=root rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' +qemu_binary=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 +emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 +kernel=/home/kvmci/linux/vmlinux +guest_script = "http://ltc-jenkins.aus.stglabs.ibm.com:81/sath/epcci/nested.sh" +virtinstall_qemu_cmdline=" -M pseries,cap-nested-hv=on" + +variants: + - L1: + only nested_test From 984291cd4be3119fc06d4828631178afb16d2745 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Fri, 18 Dec 2020 17:18:19 +0530 Subject: [PATCH 09/16] Fixup nested config Fixup nested config with wrong linux path Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/nested.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tests/guest/libvirt/nested.cfg b/config/tests/guest/libvirt/nested.cfg index 6ad94b7d..a2f4a9ab 100644 --- a/config/tests/guest/libvirt/nested.cfg +++ b/config/tests/guest/libvirt/nested.cfg @@ -46,12 +46,12 @@ use_serial_login=yes test_timeout = 72000 variants: - - prepare_environ: + - vmkernel: only virtio_net only qcow2 only smalpages only virtio_scsi - pre_command = "rm -rf /home/epcci/linux;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/linux/ && cd /home/epcci/linux/vmlinux && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" + pre_command = "rm -rf /home/epcci/linux;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/linux/ && cd /home/epcci/linux/ && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' only guest_test.isa_serial_operations From c2064538a96446323224bb171e68ac409ebbf250 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Fri, 18 Dec 2020 17:33:44 +0530 Subject: [PATCH 10/16] Fix typo Fix typo for smallpages Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/nested.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tests/guest/libvirt/nested.cfg b/config/tests/guest/libvirt/nested.cfg index a2f4a9ab..be92c7c1 100644 --- a/config/tests/guest/libvirt/nested.cfg +++ b/config/tests/guest/libvirt/nested.cfg @@ -49,7 +49,7 @@ variants: - vmkernel: only virtio_net only qcow2 - only smalpages + only smallpages only virtio_scsi pre_command = "rm -rf /home/epcci/linux;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/linux/ && cd /home/epcci/linux/ && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' From 3567601eee3543051ed56f5d0a1366681415bd31 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 5 Jan 2021 13:34:50 +0530 Subject: [PATCH 11/16] Update the guest kernel path Update the guest kernel path Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/L1.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tests/guest/libvirt/L1.cfg b/config/tests/guest/libvirt/L1.cfg index 8b2c1f3d..d24aec88 100644 --- a/config/tests/guest/libvirt/L1.cfg +++ b/config/tests/guest/libvirt/L1.cfg @@ -48,7 +48,7 @@ restore_image_after_testing=no kernel_args='root=/dev/sda3 rootflags=subvol=root rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' qemu_binary=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 -kernel=/home/kvmci/linux/vmlinux +kernel=/home/epcci/linux/vmlinux guest_script = "http://ltc-jenkins.aus.stglabs.ibm.com:81/sath/epcci/nested.sh" virtinstall_qemu_cmdline=" -M pseries,cap-nested-hv=on" From f97582e5f273f9220f5a2a1bba742982c844f53c Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Tue, 5 Jan 2021 18:01:39 +0530 Subject: [PATCH 12/16] Adjust the guest kernel commandline Adjust the guest kernel commandline to match guest root filesystem Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/L1.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/tests/guest/libvirt/L1.cfg b/config/tests/guest/libvirt/L1.cfg index d24aec88..51188ceb 100644 --- a/config/tests/guest/libvirt/L1.cfg +++ b/config/tests/guest/libvirt/L1.cfg @@ -45,13 +45,14 @@ kill_vm=yes env_cleanup=yes backup_image_before_testing=no restore_image_after_testing=no -kernel_args='root=/dev/sda3 rootflags=subvol=root rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' +kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' qemu_binary=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/bin/qemu-system-ppc64 -kernel=/home/epcci/linux/vmlinux +kernel=/home/epcci/guest/linux/vmlinux guest_script = "http://ltc-jenkins.aus.stglabs.ibm.com:81/sath/epcci/nested.sh" virtinstall_qemu_cmdline=" -M pseries,cap-nested-hv=on" variants: - L1: + pre_command = "rm -rf /home/epcci/guest;mkdir -p /home/epcci/guest/;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/guest/linux/ && cd /home/epcci/guest/linux/ && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" only nested_test From f435aa5c305e7b32bf0a05d5fd994df3d6ba4884 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Wed, 6 Jan 2021 18:13:38 +0530 Subject: [PATCH 13/16] Enable additional kernel config for L1 guest kernel Enable additional kernel config for L1 guest kernel to get libvirt and required other functionalites working as nested guest to run L2 guest inside. Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/L1.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tests/guest/libvirt/L1.cfg b/config/tests/guest/libvirt/L1.cfg index 51188ceb..9284397c 100644 --- a/config/tests/guest/libvirt/L1.cfg +++ b/config/tests/guest/libvirt/L1.cfg @@ -54,5 +54,5 @@ virtinstall_qemu_cmdline=" -M pseries,cap-nested-hv=on" variants: - L1: - pre_command = "rm -rf /home/epcci/guest;mkdir -p /home/epcci/guest/;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/guest/linux/ && cd /home/epcci/guest/linux/ && git log -1 && make ppc64le_guest_defconfig && make -j 100 -s" + pre_command = "rm -rf /home/epcci/guest;mkdir -p /home/epcci/guest/;git clone --depth 1 https://github.com/torvalds/linux /home/epcci/guest/linux/ && cd /home/epcci/guest/linux/ && wget http://ltc-jenkins.aus.stglabs.ibm.com:81/sath/epcci/0001-Add-additional-kernel-configs.patch && git am 0001-Add-additional-kernel-configs.patch && git log -2 && make ppc64le_guest_defconfig && make -j 100 -s" only nested_test From 2b9b6c3751c5655a78048a2a125f07be639f3b22 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Wed, 6 Jan 2021 21:13:18 +0530 Subject: [PATCH 14/16] Fixup: cap-nested-hv capability parameter input from True to on This patch fixes the below error while booting the guest, qemu-system-ppc64: Parameter 'cap-nested-hv' expects 'on' or 'off' Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/nested.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tests/guest/libvirt/nested.cfg b/config/tests/guest/libvirt/nested.cfg index be92c7c1..bd1bd9f4 100644 --- a/config/tests/guest/libvirt/nested.cfg +++ b/config/tests/guest/libvirt/nested.cfg @@ -189,7 +189,7 @@ variants: - with_nested_cap: no with_vsmt,with_intc,mem_merge only with_smt4,with_smt8 - virtinstall_qemu_cmdline_vm1=" -M pseries,cap-nested-hv=True" + virtinstall_qemu_cmdline_vm1=" -M pseries,cap-nested-hv=on" variants: - with_virtio_scsi: kernel_args='root=/dev/sda2 rw console=tty0 console=ttyS0,115200 init=/sbin/init initcall_debug selinux=0' From 8e790763956c760f076cd19af367caeb8ca2f207 Mon Sep 17 00:00:00 2001 From: Satheesh Rajendran Date: Wed, 20 Jan 2021 20:54:53 +0530 Subject: [PATCH 15/16] Increase login timeout and run script from ssh login Increase login timeout and run script from ssh login as serial login gets unexpected issues. Signed-off-by: Satheesh Rajendran --- config/tests/guest/libvirt/L1.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/tests/guest/libvirt/L1.cfg b/config/tests/guest/libvirt/L1.cfg index 9284397c..89c08c64 100644 --- a/config/tests/guest/libvirt/L1.cfg +++ b/config/tests/guest/libvirt/L1.cfg @@ -51,6 +51,9 @@ emulator_path=/usr/local/lib/python3.9/site-packages/virttest/bin/install_root/b kernel=/home/epcci/guest/linux/vmlinux guest_script = "http://ltc-jenkins.aus.stglabs.ibm.com:81/sath/epcci/nested.sh" virtinstall_qemu_cmdline=" -M pseries,cap-nested-hv=on" +login_timeout = 600 +serial_login = no + variants: - L1: From c7ecec24e417af5c9a892bbf5bc8d12d8906d0a1 Mon Sep 17 00:00:00 2001 From: Praveen K Pandey Date: Wed, 10 Nov 2021 10:28:38 +0530 Subject: [PATCH 16/16] Revert "Add custom config for CI tests" This reverts commit d9ac128a38b4c4d9632701ec681b68b7d42616d8. --- config/wrapper/env.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/wrapper/env.conf b/config/wrapper/env.conf index 5b1cada6..210344ed 100644 --- a/config/wrapper/env.conf +++ b/config/wrapper/env.conf @@ -3,9 +3,9 @@ # (avocado-framework, '') -- Installs latest released version # ('avocado-framework', 80.0) -- Installs specificed version, make sure you change other entries aswell # ('avocado-framework', 'git+https://github.com/avocado-framework/avocado.git') -- Install version from the given git repo -base = [('avocado-framework', '83.0'), ('avocado-framework-plugin-varianter-yaml-to-mux', '83.0')] -kvm = [('avocado-framework-plugin-vt', 'git+https://github.com/sathnaga/avocado-vt@v83.0_ci')] -optional = [('avocado-framework-plugin-result-html', '83.0')] +base = [('avocado-framework', ''), ('avocado-framework-plugin-varianter-yaml-to-mux', '')] +kvm = [('avocado-framework-plugin-vt', '')] +optional = [('avocado-framework-plugin-result-html', '')] [tests] # Usage Examples: