From 1352d5688da004642d3e9e19697802989f2915d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Date: Tue, 17 Nov 2020 17:36:35 +0000
Subject: [PATCH] gitlab-ci: Move trace backend tests across to gitlab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201111121234.3246812-3-philmd@redhat.com>
Message-Id: <20201117173635.29101-7-alex.bennee@linaro.org>
---
.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 b406027a554..d0173e82b16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -415,6 +415,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 bac085f8002..1f80bdb6249 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
--
GitLab