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

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
---
 .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 6552a832939..2f0da7b3dc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -557,6 +557,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=aarch64-softmmu
+
+build-trace-ust-system:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: fedora
+    CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu --disable-tcg
 
 check-patch:
   stage: build
diff --git a/.travis.yml b/.travis.yml
index 8ef31f8d8b6..ff5d5ead579 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -182,25 +182,6 @@ jobs:
       compiler: clang
 
 
-    # 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

On Sun, Nov 08, 2020 at 09:45:32PM +0100, Philippe Mathieu-Daudé wrote:
> Similarly to commit 8cdb2cef3f1, move the trace backend
> tests to GitLab.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  .gitlab-ci.yml | 18 ++++++++++++++++++
>  .travis.yml    | 19 -------------------
>  2 files changed, 18 insertions(+), 19 deletions(-)

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

On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
> Similarly to commit 8cdb2cef3f1, move the trace backend
> tests to GitLab.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   .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 6552a832939..2f0da7b3dc1 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -557,6 +557,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

Doesn't it need the lttng-ust-dev package in Ubuntu's image likewise you 
did for Fedora (patch 13)?

> +    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=aarch64-softmmu
On Travis it builds the x86_64 softmmu target. Changed to aarch64 to 
increase coverage?
> +
> +build-trace-ust-system:
> +  <<: *native_build_job_definition
> +  variables:
> +    IMAGE: fedora

Similar question here, increasing coverage by using Fedora?

- Wainer

> +    CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu --disable-tcg
>   
>   check-patch:
>     stage: build
> diff --git a/.travis.yml b/.travis.yml
> index 8ef31f8d8b6..ff5d5ead579 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -182,25 +182,6 @@ jobs:
>         compiler: clang
>   
>   
> -    # 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

On 11/10/20 7:12 PM, Wainer dos Santos Moschetta wrote:
> 
> On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
>> Similarly to commit 8cdb2cef3f1, move the trace backend
>> tests to GitLab.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>> ---
>>   .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 6552a832939..2f0da7b3dc1 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -557,6 +557,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
> 
> Doesn't it need the lttng-ust-dev package in Ubuntu's image likewise you
> did for Fedora (patch 13)?

No, because ...

>> +    CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog
>> --disable-system

... we don't build the User-Space Tracer there.

>> +
>> +build-trace-ftrace-system:
>> +  <<: *native_build_job_definition
>> +  variables:
>> +    IMAGE: ubuntu2004
>> +    CONFIGURE_ARGS: --enable-trace-backends=ftrace
>> --target-list=aarch64-softmmu
> On Travis it builds the x86_64 softmmu target. Changed to aarch64 to
> increase coverage?

Maybe because the next job already test this target? I'll change.

>> +
>> +build-trace-ust-system:
>> +  <<: *native_build_job_definition
>> +  variables:
>> +    IMAGE: fedora
> 
> Similar question here, increasing coverage by using Fedora?

No, because User-Space Tracer is a feature Red Hat cares
about, and plan to maintain, so it makes sense to test it
on Fedora. I'll comment this change in the description.

> 
> - Wainer
> 
>> +    CONFIGURE_ARGS: --enable-trace-backends=ust
>> --target-list=x86_64-softmmu --disable-tcg
>>     check-patch:
>>     stage: build
>> diff --git a/.travis.yml b/.travis.yml
>> index 8ef31f8d8b6..ff5d5ead579 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -182,25 +182,6 @@ jobs:
>>         compiler: clang
>>     -    # 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
> 

On 11/11/20 9:42 AM, Philippe Mathieu-Daudé wrote:
> On 11/10/20 7:12 PM, Wainer dos Santos Moschetta wrote:
>>
>> On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
>>> Similarly to commit 8cdb2cef3f1, move the trace backend
>>> tests to GitLab.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>>> ---
>>>   .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 6552a832939..2f0da7b3dc1 100644
>>> --- a/.gitlab-ci.yml
>>> +++ b/.gitlab-ci.yml
>>> @@ -557,6 +557,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
>>
>> Doesn't it need the lttng-ust-dev package in Ubuntu's image likewise you
>> did for Fedora (patch 13)?
> 
> No, because ...
> 
>>> +    CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog
>>> --disable-system
> 
> ... we don't build the User-Space Tracer there.

And User-Space Tracer is covered on Ubuntu by the s390x
jobs on Travis. I'll add a comment so this is clear.

Thanks.

On 11/11/20 9:42 AM, Philippe Mathieu-Daudé wrote:
> On 11/10/20 7:12 PM, Wainer dos Santos Moschetta wrote:
>>
>> On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
>>> Similarly to commit 8cdb2cef3f1, move the trace backend
>>> tests to GitLab.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>>> ---
>>>   .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 6552a832939..2f0da7b3dc1 100644
>>> --- a/.gitlab-ci.yml
>>> +++ b/.gitlab-ci.yml
>>> @@ -557,6 +557,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
>>
>> Doesn't it need the lttng-ust-dev package in Ubuntu's image likewise you
>> did for Fedora (patch 13)?
> 
> No, because ...
> 
>>> +    CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog
>>> --disable-system
> 
> ... we don't build the User-Space Tracer there.
> 
>>> +
>>> +build-trace-ftrace-system:
>>> +  <<: *native_build_job_definition
>>> +  variables:
>>> +    IMAGE: ubuntu2004
>>> +    CONFIGURE_ARGS: --enable-trace-backends=ftrace
>>> --target-list=aarch64-softmmu
>> On Travis it builds the x86_64 softmmu target. Changed to aarch64 to
>> increase coverage?
> 
> Maybe because the next job already test this target? I'll change.
> 
>>> +
>>> +build-trace-ust-system:
>>> +  <<: *native_build_job_definition
>>> +  variables:
>>> +    IMAGE: fedora
>>
>> Similar question here, increasing coverage by using Fedora?
> 
> No, because User-Space Tracer is a feature Red Hat cares
> about, and plan to maintain, so it makes sense to test it
> on Fedora. I'll comment this change in the description.

Bah, this is a different change in itself, out of the scope of
this series. I'll keep Ubuntu image. Whoever is interested to
test this on Fedora can add a proper job. Thanks.