Skip to contentSkip to conversation

ci: Move trace backend tests across to gitlab

PATCH Applied Philippe Mathieu-Daudé 3 participants 5 messages Nov 11, 2020 – Nov 17, 2020

lore
Share & tools
lore
#0 lore raw

v5 cover ci: Move trace backend tests across to gitlab

Extracted from "ci: Move various jobs from Travis to GitLab CI":
https://www.mail-archive.com/[email protected]/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(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v5 1/2 tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image

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

---

---
 tests/docker/dockerfiles/ubuntu2004.docker | 1 +
 1 file changed, 1 insertion(+)
tests/docker/dockerfiles/ubuntu2004.docker +1 -0
index 355bbb3c638..ae889d8482c 100644
@@ -23,6 +23,7 @@ ENV PACKAGES flex bison \
     libiscsi-dev \
     libjemalloc-dev \
     libjpeg-turbo8-dev \
+    liblttng-ust-dev \
     liblzo2-dev \
     libncurses5-dev \
     libncursesw5-dev \
Signature · 1 line
2.26.2
#2 lore raw

PATCH v5 2/2 gitlab-ci: Move trace backend tests across to gitlab

In reply to 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.

---
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(-)
.gitlab-ci.yml +18 -0
index 9a8b3751882..06629243318 100644
@@ -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
.travis.yml +0 -19
index a3d78171cab..aa19762770a 100644
@@ -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
Signature · 1 line
2.26.2
Reviewed-by on the v5 series
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 6 lines · Philippe Mathieu-Daudé

Extracted from "ci: Move various jobs from Travis to GitLab CI":
https://www.mail-archive.com/[email protected]/msg758314.html

v5:
- addressed Wainer's review comment

Quoted 13 lines

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(-)
Signature · 1 line
2.26.2
Applied
#4 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 2 lines · Philippe Mathieu-Daudé

Extracted from "ci: Move various jobs from Travis to GitLab CI":
https://www.mail-archive.com/[email protected]/msg758314.html

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

Quoted 12 lines

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(-)
Signature · 1 line
Alex Bennée