[PATCH-for-5.2? v5 0/2] ci: Move trace backend tests across to gitlab

[PATCH-for-5.2? v5 0/2] ci: Move trace backend tests across to gitlab

[Philippe Mathieu-Daudé]

Extracted from "ci: Move various jobs from Travis to GitLab CI":
https://www.mail-archive.com/qemu-devel@nongnu.org/msg758314.html

v5:
- addressed Wainer's review comment

Philippe Mathieu-Daudé (2):
  tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image
  gitlab-ci: Move trace backend tests across to gitlab

 .gitlab-ci.yml                             | 18 ++++++++++++++++++
 .travis.yml                                | 19 -------------------
 tests/docker/dockerfiles/ubuntu2004.docker |  1 +
 3 files changed, 19 insertions(+), 19 deletions(-)

-- 
2.26.2

[PATCH-for-5.2? v5 1/2] tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image

[Philippe Mathieu-Daudé]

Install the liblttng-ust-dev package to be able to
build QEMU using the User-Space Tracer trace backend
(configure --enable-trace-backends=ust).

Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/docker/dockerfiles/ubuntu2004.docker | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 355bbb3c638..ae889d8482c 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -23,6 +23,7 @@ ENV PACKAGES flex bison \
     libiscsi-dev \
     libjemalloc-dev \
     libjpeg-turbo8-dev \
+    liblttng-ust-dev \
     liblzo2-dev \
     libncurses5-dev \
     libncursesw5-dev \
-- 
2.26.2

[PATCH-for-5.2? v5 2/2] gitlab-ci: Move trace backend tests across to gitlab

[Philippe Mathieu-Daudé]

Similarly to commit 8cdb2cef3f1, move the trace backend
tests to GitLab.

Note the User-Space Tracer backend is still tested on
Ubuntu by the s390x jobs on Travis-CI.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Previous version had "Reviewed-by: Stefan Hajnoczi" but was
testing User-Space Tracer on Fedora. Since I kept Ubuntu,
resetting Stefan's tag.
---
 .gitlab-ci.yml | 18 ++++++++++++++++++
 .travis.yml    | 19 -------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a8b3751882..06629243318 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -398,6 +398,24 @@ check-crypto-only-gnutls:
     IMAGE: centos7
     MAKE_CHECK_ARGS: check
 
+# We don't need to exercise every backend with every front-end
+build-trace-multi-user:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog --disable-system
+
+build-trace-ftrace-system:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --enable-trace-backends=ftrace --target-list=x86_64-softmmu
+
+build-trace-ust-system:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
 
 check-patch:
   stage: build
diff --git a/.travis.yml b/.travis.yml
index a3d78171cab..aa19762770a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -232,25 +232,6 @@ jobs:
         - TEST_CMD=""
 
 
-    # We don't need to exercise every backend with every front-end
-    - name: "GCC trace log,simple,syslog (user)"
-      env:
-        - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system"
-        - TEST_CMD=""
-
-
-    - name: "GCC trace ftrace (x86_64-softmmu)"
-      env:
-        - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu"
-        - TEST_CMD=""
-
-
-    - name: "GCC trace ust (x86_64-softmmu)"
-      env:
-        - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu"
-        - TEST_CMD=""
-
-
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
       dist: bionic
-- 
2.26.2

Re: [PATCH-for-5.2? v5 0/2] ci: Move trace backend tests across to gitlab

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

On Wed, Nov 11, 2020 at 01:12:32PM +0100, Philippe Mathieu-Daudé wrote:
> Extracted from "ci: Move various jobs from Travis to GitLab CI":
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg758314.html
> 
> v5:
> - addressed Wainer's review comment
> 
> Philippe Mathieu-Daudé (2):
>   tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image
>   gitlab-ci: Move trace backend tests across to gitlab
> 
>  .gitlab-ci.yml                             | 18 ++++++++++++++++++
>  .travis.yml                                | 19 -------------------
>  tests/docker/dockerfiles/ubuntu2004.docker |  1 +
>  3 files changed, 19 insertions(+), 19 deletions(-)
> 
> -- 
> 2.26.2
> 
> 

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH-for-5.2? v5 0/2] ci: Move trace backend tests across to gitlab

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Extracted from "ci: Move various jobs from Travis to GitLab CI":
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg758314.html

Queued to for-5.2/fixes-for-rc3, thanks.

>
> v5:
> - addressed Wainer's review comment
>
> Philippe Mathieu-Daudé (2):
>   tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image
>   gitlab-ci: Move trace backend tests across to gitlab
>
>  .gitlab-ci.yml                             | 18 ++++++++++++++++++
>  .travis.yml                                | 19 -------------------
>  tests/docker/dockerfiles/ubuntu2004.docker |  1 +
>  3 files changed, 19 insertions(+), 19 deletions(-)


-- 
Alex Bennée