From ba27de8d0425a14203fc701dc50f5e91746afb7e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 20 Feb 2019 11:45:23 +0100 Subject: [PATCH 1/9] .travis.yml: the xcode10 image seems to be hosed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It fails to install homebrew. Unfortunately we cannot mark it as an expected failure because Travis does not match allow_failures rows against include rows (only against the main test matrix, which we do not use at all), so just disable it. Signed-off-by: Paolo Bonzini Message-Id: <20190220105131.23479-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index baa06b976a..866a1872b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -174,13 +174,6 @@ matrix: compiler: clang - - env: - - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" - os: osx - osx_image: xcode10 - compiler: clang - - # Python builds - env: - CONFIG="--target-list=x86_64-softmmu" From 4e6e7df61e1408d09990a12bc050be8e65e7f4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Feb 2019 11:28:25 +0000 Subject: [PATCH 2/9] .travis.yml: split debug builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The builds are reaching the magic 50 minute limit with regularity so lets split them up. Rather than doing a full debug build on both just enable debug tcg for linux-user. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 866a1872b1..36ed7ec3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,12 @@ matrix: - env: - - CONFIG="--enable-debug --enable-debug-tcg" + - CONFIG="--enable-debug --enable-debug-tcg --disable-user" + + + # TCG debug can be run just on it's own and is mostly agnostic to user/softmmu distinctions + - env: + - CONFIG="--enable-debug-tcg --disable-system" - env: From ad0adb4b0e69ee4f9e99c1b446ba4d7fdb404e2a Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 15 Feb 2019 09:45:01 +0000 Subject: [PATCH 3/9] .travis.yml: Test with disable-replication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've had the build break with replication disabled, so lets test that case in travis. Suggsted-by: Alex Bennée Signed-off-by: Dr. David Alan Gilbert Message-Id: <20190215094502.32149-1-dgilbert@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36ed7ec3f9..61b086b8b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ matrix: - env: - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user --disable-replication" - env: From 4aeb5d242872ff31698698db4fbb2148a327796a Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 15 Feb 2019 09:45:02 +0000 Subject: [PATCH 4/9] .travis.yml: Remove disable-uuid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 315d3184525 turned --disable-uuid into a warning only; remove the check from Travis. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20190215094502.32149-2-dgilbert@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61b086b8b8..cca57f4314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ matrix: - env: - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user --disable-replication" + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-user --disable-replication" - env: From a48a1d18274f0e69cdbb29d1e51a0da52311ae5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Feb 2019 11:18:36 +0000 Subject: [PATCH 5/9] tests/docker: squash initial update and install step for debian9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian9.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker index 154ae2a455..5f23a35404 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -13,8 +13,8 @@ FROM debian:stretch-slim RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # Install common build utilities -RUN apt update -RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ From e92a43bb1868cda5b267c982dcd61a4cbe549ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Feb 2019 11:29:48 +0000 Subject: [PATCH 6/9] tests/docker: peg netmap code to a specific version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tracking head is always going to be at the whims of the upstream. Let's use a defined release so things don't magically change under us. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/docker/dockerfiles/debian-amd64.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 954fcf9606..d770a11a52 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -33,6 +33,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ linux-headers-amd64 RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap +RUN cd /usr/src/netmap && git checkout v11.3 RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap From 0a8b05c7cbd1412561d72e80beb9bead57a1a9aa Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 13 Feb 2019 12:54:41 +0100 Subject: [PATCH 7/9] Add a gitlab-ci file for Continuous Integration testing on Gitlab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is very convenient for people like me who store their QEMU git trees on gitlab.com: Automatic CI pipelines are now run for each branch that is pushed to the server - useful for some extra-testing before sending PULL- requests for example. Since the runtime of the jobs is limited to 1h, the jobs are distributed into multiple pipelines - this way everything finishs fine within time (ca. 30 minutes currently). Signed-off-by: Thomas Huth Message-Id: <1550058881-16351-1-git-send-email-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Marc-André Lureau Reviewed-by: Cleber Rosa --- .gitlab-ci.yml | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 5 ++++ 2 files changed, 78 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..79d02cf740 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,73 @@ +before_script: + - apt-get update -qq + - apt-get install -y -qq flex bison libglib2.0-dev libpixman-1-dev genisoimage + +build-system1: + script: + - apt-get install -y -qq libgtk-3-dev libvte-dev nettle-dev libcacard-dev + libusb-dev libvde-dev libspice-protocol-dev libgl1-mesa-dev + - ./configure --enable-werror --target-list="aarch64-softmmu alpha-softmmu + cris-softmmu hppa-softmmu lm32-softmmu moxie-softmmu microblazeel-softmmu + mips64el-softmmu m68k-softmmu ppc-softmmu riscv64-softmmu sparc-softmmu" + - make -j2 + - make -j2 check + +build-system2: + script: + - apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev + libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev + - ./configure --enable-werror --target-list="tricore-softmmu unicore32-softmmu + microblaze-softmmu mips-softmmu riscv32-softmmu s390x-softmmu sh4-softmmu + sparc64-softmmu x86_64-softmmu xtensa-softmmu nios2-softmmu or1k-softmmu" + - make -j2 + - make -j2 check + +build-disabled: + script: + - ./configure --enable-werror --disable-rdma --disable-slirp --disable-curl + --disable-capstone --disable-live-block-migration --disable-glusterfs + --disable-replication --disable-coroutine-pool --disable-smartcard + --disable-guest-agent --disable-curses --disable-libxml2 --disable-tpm + --disable-qom-cast-debug --disable-spice --disable-vhost-vsock + --disable-vhost-net --disable-vhost-crypto --disable-vhost-user + --target-list="i386-softmmu ppc64-softmmu mips64-softmmu i386-linux-user" + - make -j2 + - make -j2 check-qtest SPEED=slow + +build-tcg-disabled: + script: + - apt-get install -y -qq clang libgtk-3-dev libbluetooth-dev libusb-dev + - ./configure --cc=clang --enable-werror --disable-tcg --audio-drv-list="" + - make -j2 + - make check-unit + - make check-qapi-schema + - cd tests/qemu-iotests/ + - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 + 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160 + 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236 + - ./check -qcow2 001 002 003 004 005 007 008 009 010 011 012 013 017 018 019 + 020 021 022 024 025 027 028 029 031 032 033 034 035 036 037 038 + 039 040 042 043 046 047 048 049 050 051 052 053 054 056 057 058 + 060 061 062 063 065 066 067 068 069 071 072 073 074 079 080 082 + 085 086 089 090 091 095 096 097 098 099 102 103 104 105 107 108 + 110 111 114 117 120 122 124 126 127 129 130 132 133 134 137 138 + 139 140 141 142 143 144 145 147 150 151 152 154 155 156 157 158 + 161 165 170 172 174 176 177 179 184 186 187 190 192 194 195 196 + 197 200 202 203 205 208 209 214 215 216 217 218 222 226 227 229 234 + +build-user: + script: + - ./configure --enable-werror --disable-system --disable-guest-agent + --disable-capstone --disable-slirp --disable-fdt + - make -j2 + - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user + +build-clang: + script: + - apt-get install -y -qq clang libsdl2-dev + xfslibs-dev libiscsi-dev libnfs-dev libseccomp-dev gnutls-dev librbd-dev + - ./configure --cc=clang --cxx=clang++ --enable-werror + --target-list="alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu + ppc-softmmu s390x-softmmu x86_64-softmmu arm-linux-user" + - make -j2 + - make -j2 check diff --git a/MAINTAINERS b/MAINTAINERS index b1d786cfd8..c6f2976c18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2479,6 +2479,11 @@ S: Maintained F: .cirrus.yml W: https://cirrus-ci.com/github/qemu/qemu +GitLab Continuous Integration +M: Thomas Huth +S: Maintained +F: .gitlab-ci.yml + Guest Test Compilation Support M: Alex Bennée R: Philippe Mathieu-Daudé From 4f575c08ca856f03fd5c8567f5ca9389433e3e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Feb 2019 15:03:29 +0000 Subject: [PATCH 8/9] tests/softfloat: always do quick softfloat tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some operations take a long time and enabling "-l 2 -r all" can take more than a day which is stretching the definition of a "slow" test. Lets default to the quick test and leave a note for those who wish to run by hand. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/Makefile.include | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b39e989f72..3741f8f6dd 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -896,11 +896,9 @@ $(FP_TEST_BIN): "BUILD", "$(notdir $@)") # The full test suite can take a bit of time, default to a quick run -ifeq ($(SPEED), quick) +# "-l 2 -r all" can take more than a day for some operations and is best +# run manually FP_TL=-l 1 -else -FP_TL=-l 2 -r all -endif # $1 = tests, $2 = description test-softfloat = $(call quiet-command, \ From 4300dadc00bec6d75283ffbe1fd85c2b442bef2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 21 Feb 2019 13:26:28 +0000 Subject: [PATCH 9/9] tests/cdrom-test: only include isapc cdrom test when g_test_slow() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are seeing instability on our CI runs which has been there since the test was introduced. I suspect it triggers more on Travis due to their heavy load. Signed-off-by: Alex Bennée Acked-by: Thomas Huth --- tests/cdrom-test.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c index 14bd981336..05611da648 100644 --- a/tests/cdrom-test.c +++ b/tests/cdrom-test.c @@ -132,8 +132,14 @@ static void add_x86_tests(void) qtest_add_data_func("cdrom/boot/virtio-scsi", "-device virtio-scsi -device scsi-cd,drive=cdr " "-blockdev file,node-name=cdr,filename=", test_cdboot); - qtest_add_data_func("cdrom/boot/isapc", "-M isapc " - "-drive if=ide,media=cdrom,file=", test_cdboot); + /* + * Unstable CI test under load + * See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html + */ + if (g_test_slow()) { + qtest_add_data_func("cdrom/boot/isapc", "-M isapc " + "-drive if=ide,media=cdrom,file=", test_cdboot); + } qtest_add_data_func("cdrom/boot/am53c974", "-device am53c974 -device scsi-cd,drive=cd1 " "-drive if=none,id=cd1,format=raw,file=", test_cdboot);