* Two fuzzer patches from Alexander
* Show logs of failed acceptance jobs in the gitlab-CI -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAl/gpV0RHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbUUmA//eGv+EL6Mqot42ZMuuwpDkoD4kg6yNX0m xUbvzWhWWlyIAEUZBoHb4s8vpZRuS0Zo/aGt9q3oCBdomiU72ageTT6urrbRSdH+ X5WdBpVgudKePBBvS8AtsDHkC346nZqZYop67QFiwAYScaZMXtcblIosJm7n+ogJ UwQjzPEsIzG3dX8eaMQVTnTpKlaiXQDnOEy59vOnNMpM0f7hsG7FxNYtOByvkMzS zp5ntO+ZqbP804xR15exUIISqvJQKYLdEaKkBOH99LVxyvz43oBknh/kpUrtcSam aNC5tbY3Z7WrkXwOBvAWT6my6GW9aeIGm5xu3U8wFlDS7+2bCrwxqhVxRqZWqKCd 0D+xiXsCiVmloAyWfGDqA3vqQzTPgyvwnGyrgU4R8uu4RgzvmD4dGjZhVFkWhWu1 hQXZh1JhbzjiFuIufF9x2Ccq0MQSuU2puH8scqYFKf/W1eEYoeVqFd+uEw2Dm5cg hTQQEn2pT6y6EA4x6uvKXEeF3B+N3HCYuufOYqsFerL0p5wfWGvUWnxR3f1oqtQY RmejgmaNX+Os/t0HPIR9vf5x6VIZVY5M+GsThcPFyKI5vWa5vfVokOYOQcov2COT 5hgm24L2eW3yHgcQ/Rq3bTxG7ZMaXaCWzbUJgkG/IAmsmCEY/j3TnM42BqGoPlG8 DGbWZ4cNIc4= =lmIG -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-12-21' into staging * Two fuzzer patches from Alexander * Show logs of failed acceptance jobs in the gitlab-CI # gpg: Signature made Mon 21 Dec 2020 13:38:37 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2020-12-21: gitlab-ci: Archive logs of acceptance tests gitlab-ci: Refactor code that show logs of failed acceptances tests/acceptance: Bump avocado requirements to 83.0 fuzz: fix the generic-fuzz-floppy config fuzz: Add more i386 configurations for fuzzing Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
3896895ab4
@ -49,8 +49,12 @@ include:
|
||||
- ${CI_PROJECT_DIR}/avocado-cache
|
||||
policy: pull-push
|
||||
artifacts:
|
||||
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
||||
when: always
|
||||
expire_in: 2 days
|
||||
paths:
|
||||
- build/tests/results/latest/results.xml
|
||||
- build/tests/results/latest/test-results
|
||||
reports:
|
||||
junit: build/tests/results/latest/results.xml
|
||||
before_script:
|
||||
@ -58,13 +62,14 @@ include:
|
||||
- echo "[datadir.paths]" > ~/.config/avocado/avocado.conf
|
||||
- echo "cache_dirs = ['${CI_PROJECT_DIR}/avocado-cache']"
|
||||
>> ~/.config/avocado/avocado.conf
|
||||
- echo -e '[job.output.testlogs]\nstatuses = ["FAIL"]'
|
||||
>> ~/.config/avocado/avocado.conf
|
||||
- if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then
|
||||
du -chs ${CI_PROJECT_DIR}/avocado-cache ;
|
||||
fi
|
||||
- export AVOCADO_ALLOW_UNTRUSTED_CODE=1
|
||||
after_script:
|
||||
- cd build
|
||||
- python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP", "CANCEL")]' | xargs cat
|
||||
- du -chs ${CI_PROJECT_DIR}/avocado-cache
|
||||
|
||||
build-system-ubuntu:
|
||||
|
||||
@ -92,9 +92,9 @@ const generic_fuzz_config predefined_configs[] = {
|
||||
},{
|
||||
.name = "floppy",
|
||||
.args = "-machine pc -nodefaults -device floppy,id=floppy0 "
|
||||
"-drive id=disk0,file=null-co://,file.read-zeroes=on,if=none "
|
||||
"-drive id=disk0,file=null-co://,file.read-zeroes=on,if=none,format=raw "
|
||||
"-device floppy,drive=disk0,drive-type=288",
|
||||
.objects = "fd* floppy*",
|
||||
.objects = "fd* floppy* i8257",
|
||||
},{
|
||||
.name = "xhci",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
@ -114,6 +114,86 @@ const generic_fuzz_config predefined_configs[] = {
|
||||
.name = "pc-q35",
|
||||
.args = "-machine q35",
|
||||
.objects = "*",
|
||||
},{
|
||||
.name = "vmxnet3",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device vmxnet3,netdev=net0 -netdev user,id=net0",
|
||||
.objects = "vmxnet3"
|
||||
},{
|
||||
.name = "ne2k_pci",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device ne2k_pci,netdev=net0 -netdev user,id=net0",
|
||||
.objects = "ne2k*"
|
||||
},{
|
||||
.name = "pcnet",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device pcnet,netdev=net0 -netdev user,id=net0",
|
||||
.objects = "pcnet"
|
||||
},{
|
||||
.name = "rtl8139",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device rtl8139,netdev=net0 -netdev user,id=net0",
|
||||
.objects = "rtl8139"
|
||||
},{
|
||||
.name = "i82550",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device i82550,netdev=net0 -netdev user,id=net0",
|
||||
.objects = "eepro*"
|
||||
},{
|
||||
.name = "sdhci-v3",
|
||||
.args = "-nodefaults -device sdhci-pci,sd-spec-version=3 "
|
||||
"-device sd-card,drive=mydrive "
|
||||
"-drive if=sd,index=0,file=null-co://,format=raw,id=mydrive -nographic",
|
||||
.objects = "sd*"
|
||||
},{
|
||||
.name = "ehci",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device ich9-usb-ehci1,bus=pcie.0,addr=1d.7,"
|
||||
"multifunction=on,id=ich9-ehci-1 "
|
||||
"-device ich9-usb-uhci1,bus=pcie.0,addr=1d.0,"
|
||||
"multifunction=on,masterbus=ich9-ehci-1.0,firstport=0 "
|
||||
"-device ich9-usb-uhci2,bus=pcie.0,addr=1d.1,"
|
||||
"multifunction=on,masterbus=ich9-ehci-1.0,firstport=2 "
|
||||
"-device ich9-usb-uhci3,bus=pcie.0,addr=1d.2,"
|
||||
"multifunction=on,masterbus=ich9-ehci-1.0,firstport=4 "
|
||||
"-drive if=none,id=usbcdrom,media=cdrom "
|
||||
"-device usb-tablet,bus=ich9-ehci-1.0,port=1,usb_version=1 "
|
||||
"-device usb-storage,bus=ich9-ehci-1.0,port=2,drive=usbcdrom",
|
||||
.objects = "*usb* *hci*",
|
||||
},{
|
||||
.name = "ohci",
|
||||
.args = "-machine q35 -nodefaults -device pci-ohci -device usb-kbd",
|
||||
.objects = "*usb* *ohci*",
|
||||
},{
|
||||
.name = "megaraid",
|
||||
.args = "-machine q35 -nodefaults -device megasas -device scsi-cd,drive=null0 "
|
||||
"-blockdev driver=null-co,read-zeroes=on,node-name=null0",
|
||||
.objects = "megasas*",
|
||||
},{
|
||||
.name = "ac97",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device ac97,audiodev=snd0 -audiodev none,id=snd0 -nodefaults",
|
||||
.objects = "ac97*",
|
||||
},{
|
||||
.name = "cs4231a",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device cs4231a,audiodev=snd0 -audiodev none,id=snd0 -nodefaults",
|
||||
.objects = "cs4231a* i8257*",
|
||||
},{
|
||||
.name = "es1370",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device es1370,audiodev=snd0 -audiodev none,id=snd0 -nodefaults",
|
||||
.objects = "es1370*",
|
||||
},{
|
||||
.name = "sb16",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-device sb16,audiodev=snd0 -audiodev none,id=snd0 -nodefaults",
|
||||
.objects = "sb16* i8257*",
|
||||
},{
|
||||
.name = "parallel",
|
||||
.args = "-machine q35 -nodefaults "
|
||||
"-parallel file:/dev/null",
|
||||
.objects = "parallel*",
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Add Python module requirements, one per line, to be installed
|
||||
# in the tests/venv Python virtual environment. For more info,
|
||||
# refer to: https://pip.pypa.io/en/stable/user_guide/#id1
|
||||
avocado-framework==81.0
|
||||
avocado-framework==83.0
|
||||
pycdlib==1.11.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user