From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH-for-6.0 v4 09/17] gitlab-ci: Move gprof/gcov test across to gitlab
Date: Sun, 8 Nov 2020 21:45:27 +0100 [thread overview]
Message-ID: <20201108204535.2319870-10-philmd@redhat.com> (raw)
In-Reply-To: <20201108204535.2319870-1-philmd@redhat.com>
Similarly to commit 8cdb2cef3f1, move the gprof/gcov test to GitLab.
The coverage-summary.sh script is not Travis-CI specific, make it
generic.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.gitlab-ci.yml | 12 ++++++++++++
.travis.yml | 14 --------------
MAINTAINERS | 2 +-
scripts/{travis => ci}/coverage-summary.sh | 2 +-
4 files changed, 14 insertions(+), 16 deletions(-)
rename scripts/{travis => ci}/coverage-summary.sh (92%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80082a602b8..d1583cee5db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -403,6 +403,18 @@ check-deprecated:
MAKE_CHECK_ARGS: check-tcg
allow_failure: true
+# gprof/gcov are GCC features
+build-gprof-gcov:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: ubuntu2004
+ CONFIGURE_ARGS: --enable-gprof --enable-gcov
+ MAKE_CHECK_ARGS: build-tcg
+ TARGETS: aarch64-softmmu mips64-softmmu ppc64-softmmu
+ riscv64-softmmu s390x-softmmu x86_64-softmmu
+ after_script:
+ - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh
+
build-oss-fuzz:
<<: *native_build_job_definition
variables:
diff --git a/.travis.yml b/.travis.yml
index bee6197290d..6087e2909cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -210,20 +210,6 @@ jobs:
compiler: clang
- # gprof/gcov are GCC features
- - name: "GCC gprof/gcov"
- dist: bionic
- addons:
- apt:
- packages:
- - ninja-build
- env:
- - CONFIG="--enable-gprof --enable-gcov --disable-libssh
- --target-list=${MAIN_SOFTMMU_TARGETS}"
- after_success:
- - ${SRC_DIR}/scripts/travis/coverage-summary.sh
-
-
# We don't need to exercise every backend with every front-end
- name: "GCC trace log,simple,syslog (user)"
env:
diff --git a/MAINTAINERS b/MAINTAINERS
index 817c7c93f91..3d8c586d444 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3121,7 +3121,7 @@ R: Philippe Mathieu-Daudé <philmd@redhat.com>
S: Maintained
F: .github/lockdown.yml
F: .travis.yml
-F: scripts/travis/
+F: scripts/ci/
F: .shippable.yml
F: tests/docker/
F: tests/vm/
diff --git a/scripts/travis/coverage-summary.sh b/scripts/ci/coverage-summary.sh
similarity index 92%
rename from scripts/travis/coverage-summary.sh
rename to scripts/ci/coverage-summary.sh
index d7086cf9ca6..8d9fb4de401 100755
--- a/scripts/travis/coverage-summary.sh
+++ b/scripts/ci/coverage-summary.sh
@@ -3,7 +3,7 @@
# Author: Alex Bennée <alex.bennee@linaro.org>
#
# Summerise the state of code coverage with gcovr and tweak the output
-# to be more sane on Travis hosts. As we expect to be executed on a
+# to be more sane on CI runner. As we expect to be executed on a
# throw away CI instance we do spam temp files all over the shop. You
# most likely don't want to execute this script but just call gcovr
# directly. See also "make coverage-report"
--
2.26.2
next prev parent reply other threads:[~2020-11-08 20:56 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 20:45 [PATCH-for-5.2 v4 00/17] ci: Move various jobs from Travis to GitLab CI Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-5.2 v4 01/17] configure: Check vhost-user is available to build vhost-user-blk-server Philippe Mathieu-Daudé
2020-11-09 8:34 ` Thomas Huth
2020-11-08 20:45 ` [PATCH-for-5.2 v4 02/17] meson: always include contrib/libvhost-user Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-5.2 v4 03/17] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-6.0 v4 04/17] MAINTAINERS: Add gitlab-pipeline-status script to GitLab CI section Philippe Mathieu-Daudé
2020-11-09 10:06 ` Thomas Huth
2020-11-09 19:29 ` Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 05/17] gitlab-ci: Split CONFIGURE_ARGS one argument per line for build-disabled Philippe Mathieu-Daudé
2020-11-09 20:57 ` Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 06/17] gitlab-ci: Update 'build-disabled' to cover all configurable options Philippe Mathieu-Daudé
2020-11-09 10:16 ` Thomas Huth
2020-11-08 20:45 ` [PATCH-for-6.0 v4 07/17] gitlab-ci: Move job testing --without-default-devices across to gitlab Philippe Mathieu-Daudé
2020-11-09 10:20 ` Thomas Huth
2020-11-09 11:04 ` Philippe Mathieu-Daudé
2020-11-09 11:18 ` Thomas Huth
2020-11-09 13:02 ` Philippe Mathieu-Daudé
2020-11-10 13:44 ` Wainer dos Santos Moschetta
2020-11-10 14:01 ` Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-6.0 v4 08/17] gitlab-ci: Move linux-user debug-tcg test " Philippe Mathieu-Daudé
2020-11-10 14:23 ` Wainer dos Santos Moschetta
2020-11-10 19:34 ` Alex Bennée
2020-11-08 20:45 ` Philippe Mathieu-Daudé [this message]
2020-11-10 15:03 ` [PATCH-for-6.0 v4 09/17] gitlab-ci: Move gprof/gcov " Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 10/17] gitlab-ci: Move user-static " Philippe Mathieu-Daudé
2020-11-10 15:06 ` Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 11/17] gitlab-ci: Move tools-only and softfloat tests " Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-6.0 v4 12/17] gitlab-ci: Move coroutine " Philippe Mathieu-Daudé
2020-11-09 9:42 ` Stefan Hajnoczi
2020-11-10 17:15 ` Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 13/17] tests/docker: Install lttng-ust-devel package in Fedora image Philippe Mathieu-Daudé
2020-11-09 9:42 ` Stefan Hajnoczi
2020-11-10 17:29 ` Wainer dos Santos Moschetta
2020-11-08 20:45 ` [PATCH-for-6.0 v4 14/17] gitlab-ci: Move trace backend tests across to gitlab Philippe Mathieu-Daudé
2020-11-09 9:48 ` Stefan Hajnoczi
2020-11-10 18:12 ` Wainer dos Santos Moschetta
2020-11-11 8:42 ` Philippe Mathieu-Daudé
2020-11-11 8:45 ` Philippe Mathieu-Daudé
2020-11-11 8:50 ` Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-6.0 v4 15/17] gitlab-ci: Add test for Xen (on CentOS 7) Philippe Mathieu-Daudé
2020-11-26 17:38 ` Anthony PERARD via
2020-11-26 17:45 ` Eduardo Habkost
2020-11-27 14:24 ` Anthony PERARD via
2020-11-30 21:28 ` Stefano Stabellini
2020-11-08 20:45 ` [PATCH-for-6.0 v4 16/17] gitlab-ci: Make some ARM 32-bit jobs optional Philippe Mathieu-Daudé
2020-11-08 22:00 ` Philippe Mathieu-Daudé
2020-11-08 20:45 ` [PATCH-for-6.0 v4 17/17] gitlab-ci: Make MIPS user-mode 32-bit little-endian job optional Philippe Mathieu-Daudé
2020-11-10 15:55 ` [PATCH-for-5.2 v4 00/17] ci: Move various jobs from Travis to GitLab CI Alex Bennée
2020-11-10 16:07 ` Philippe Mathieu-Daudé
2020-12-09 11:06 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201108204535.2319870-10-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).