[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/2] travis: remove travis configuration and all references t
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH 2/2] travis: remove travis configuration and all references to Travis CI |
Date: |
Tue, 9 Feb 2021 15:15:52 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 |
On 2/9/21 3:03 PM, Daniel P. Berrangé wrote:
> On Tue, Feb 09, 2021 at 02:58:46PM +0100, Philippe Mathieu-Daudé wrote:
>> On 2/9/21 2:50 PM, Daniel P. Berrangé wrote:
>>> The Travis CI system QEMU has been using has removed the unlimited free
>>> usage model, replacing it with a one-time only grant of CI minutes that
>>> is not renewed. The QEMU CI jobs quickly exhaust maintainer's free CI
>>> credits, leaving them unable to test with Travis. This is not a
>>> sustainable situation, so we have no choice by to discontinue use of
>>> Travis. GitLab CI is now the primary target, with Cirrus CI filling
>>> in some platform gaps where needed.
>>>
>>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>>> ---
>>> .travis.yml | 439 -----------------------------
>>> MAINTAINERS | 3 -
>>> configure | 1 -
>>> contrib/gitdm/filetypes.txt | 2 +-
>>> scripts/travis/coverage-summary.sh | 27 --
>>> tests/docker/docker.py | 2 +-
>>> tests/qemu-iotests/079 | 2 +-
>>> tests/test-util-filemonitor.c | 11 -
>>> 8 files changed, 3 insertions(+), 484 deletions(-)
>>> delete mode 100644 .travis.yml
>>> delete mode 100755 scripts/travis/coverage-summary.sh
>> ...
>>
>>> diff --git a/configure b/configure
>>> index 7c496d81fc..058a7c7967 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -4872,7 +4872,6 @@ fi
>>> ########################################
>>> # See if __attribute__((alias)) is supported.
>>> # This false for Xcode 9, but has been remedied for Xcode 10.
>>
>> Not related to this patch, but I don't think Xcode 9 is supported
>> anymore.
>>
>>> -# Unfortunately, travis uses Xcode 9 by default.
>>>
>>> attralias=no
>>> cat > $TMPC << EOF
>>
>>> diff --git a/scripts/travis/coverage-summary.sh
>>> b/scripts/travis/coverage-summary.sh
>>> deleted file mode 100755
>>> index d7086cf9ca..0000000000
>>> --- a/scripts/travis/coverage-summary.sh
>>> +++ /dev/null
>>> @@ -1,27 +0,0 @@
>>> -#!/bin/sh
>>> -#
>>> -# 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
>>> -# 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"
>>> -#
>>> -# This code is licensed under the GPL version 2 or later. See
>>> -# the COPYING file in the top-level directory.
>>> -
>>> -# first generate the coverage report
>>> -gcovr -p -o raw-report.txt
>>> -
>>> -# strip the full-path and line markers
>>> -sed s@$PWD\/@@ raw-report.txt | sed s/[0-9]\*[,-]//g > simplified.txt
>>> -
>>> -# reflow lines that got split
>>> -awk '/.[ch]$/ { printf("%s", $0); next } 1' simplified.txt > rejoined.txt
>>> -
>>> -# columnify
>>> -column -t rejoined.txt > final.txt
>>> -
>>> -# and dump, stripping out 0% coverage
>>> -grep -v "0%" final.txt
>>
>> This script can be run on other CI.
>>
>> Keeping scripts/travis/coverage-summary.sh (moved to
>> scripts/ci/coverage-summary.sh):
>
> I notice that the "gcovr" program used here should be able to output
> an XML document in a format that is supported by GitLab, which can
> then pretty-display the results.
Good idea.
> If we do that, perhaps we won't ned this coverage-summary script
> for post-processing the text output format ?
This indeed requires further testing. I'd worry about that later.
I'll let Alex see how he wants to deal with that, we can still
add the script back later.
> I guess we need to make sure gcovr is actually installed in all
> our dockerfiles used by gitlab.
>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>
> Regards,
> Daniel
>