[PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Thomas Huth]

The status of the gitlab-CI files is currently somewhat confusing, and
it is often not quite clear whether a patch should go via my tree or
via the testing tree of Alex. That situation has grown historically...
Initially, I was the only one using the gitlab-CI, just for my private
repository there. But in the course of time, the gitlab-CI switched to
use the containers from tests/docker/ (which is not part of the gitlab-CI
section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
completely for the repository and will soon use it as its gating CI, too,
so it makes way more sense if the gitlab-ci.yml files belong to the people
who are owning the qemu-project on gitlab.com and take care of the gitlab
CI there. Thus let's merge the gitlab-ci section into the common "test and
build automation" section.

While we're at it, I'm also removing the line with Fam there for now,
since he was hardly active during the last years in this area anymore.
If he ever gets more time for this part again in the future, we surely
can add the line back again.

Now to avoid that Alex is listed here alone, Philippe and I agreed to
help as backup maintainers here, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: Keep Philippe and myself as maintainer instead of reviewer

 MAINTAINERS | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 26c9454823..5c4c179abb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
 
 Build and test automation
 -------------------------
-Build and test automation
+Build and test automation, Linux Continuous Integration
 M: Alex Bennée <alex.bennee@linaro.org>
-M: Fam Zheng <fam@euphon.net>
-R: Philippe Mathieu-Daudé <philmd@redhat.com>
+M: Philippe Mathieu-Daudé <philmd@redhat.com>
+M: Thomas Huth <thuth@redhat.com>
+R: Wainer dos Santos Moschetta <wainersm@redhat.com>
 S: Maintained
 F: .github/lockdown.yml
+F: .gitlab-ci.yml
+F: .gitlab-ci.d/
 F: .travis.yml
 F: scripts/ci/
 F: tests/docker/
 F: tests/vm/
 F: scripts/archive-source.sh
+W: https://gitlab.com/qemu-project/qemu/pipelines
 W: https://travis-ci.org/qemu/qemu
 W: http://patchew.org/QEMU/
 
@@ -3289,17 +3293,6 @@ S: Maintained
 F: .cirrus.yml
 W: https://cirrus-ci.com/github/qemu/qemu
 
-GitLab Continuous Integration
-M: Thomas Huth <thuth@redhat.com>
-M: Philippe Mathieu-Daudé <philmd@redhat.com>
-M: Alex Bennée <alex.bennee@linaro.org>
-R: Wainer dos Santos Moschetta <wainersm@redhat.com>
-S: Maintained
-F: .gitlab-ci.yml
-F: .gitlab-ci.d/crossbuilds.yml
-F: .gitlab-ci.d/*py
-F: scripts/ci/gitlab-pipeline-status
-
 Guest Test Compilation Support
 M: Alex Bennée <alex.bennee@linaro.org>
 R: Philippe Mathieu-Daudé <f4bug@amsat.org>
-- 
2.27.0

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Philippe Mathieu-Daudé]

On 3/8/21 4:46 PM, Thomas Huth wrote:
> The status of the gitlab-CI files is currently somewhat confusing, and
> it is often not quite clear whether a patch should go via my tree or
> via the testing tree of Alex. That situation has grown historically...
> Initially, I was the only one using the gitlab-CI, just for my private
> repository there. But in the course of time, the gitlab-CI switched to
> use the containers from tests/docker/ (which is not part of the gitlab-CI
> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
> completely for the repository and will soon use it as its gating CI, too,
> so it makes way more sense if the gitlab-ci.yml files belong to the people
> who are owning the qemu-project on gitlab.com and take care of the gitlab
> CI there. Thus let's merge the gitlab-ci section into the common "test and
> build automation" section.
> 
> While we're at it, I'm also removing the line with Fam there for now,
> since he was hardly active during the last years in this area anymore.
> If he ever gets more time for this part again in the future, we surely
> can add the line back again.
> 
> Now to avoid that Alex is listed here alone, Philippe and I agreed to
> help as backup maintainers here, too.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Keep Philippe and myself as maintainer instead of reviewer
> 
>  MAINTAINERS | 21 +++++++--------------
>  1 file changed, 7 insertions(+), 14 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 26c9454823..5c4c179abb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>  
>  Build and test automation
>  -------------------------
> -Build and test automation
> +Build and test automation, Linux Continuous Integration

I'd rather not limit it to Linux hosts...

>  M: Alex Bennée <alex.bennee@linaro.org>
> -M: Fam Zheng <fam@euphon.net>

I'm not sure about Fam removal, he is the one maintaining patchew
(see [*] below)... Maybe we need an Ack from Paolo?

> -R: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Philippe Mathieu-Daudé <philmd@redhat.com>

Erm I don't have green light at work, so please use my personal email:

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

> +M: Thomas Huth <thuth@redhat.com>
> +R: Wainer dos Santos Moschetta <wainersm@redhat.com>
>  S: Maintained
>  F: .github/lockdown.yml
> +F: .gitlab-ci.yml
> +F: .gitlab-ci.d/
>  F: .travis.yml
>  F: scripts/ci/
>  F: tests/docker/
>  F: tests/vm/
>  F: scripts/archive-source.sh
> +W: https://gitlab.com/qemu-project/qemu/pipelines
>  W: https://travis-ci.org/qemu/qemu
>  W: http://patchew.org/QEMU/

[*]

> @@ -3289,17 +3293,6 @@ S: Maintained
>  F: .cirrus.yml
>  W: https://cirrus-ci.com/github/qemu/qemu
>  
> -GitLab Continuous Integration
> -M: Thomas Huth <thuth@redhat.com>
> -M: Philippe Mathieu-Daudé <philmd@redhat.com>
> -M: Alex Bennée <alex.bennee@linaro.org>
> -R: Wainer dos Santos Moschetta <wainersm@redhat.com>
> -S: Maintained
> -F: .gitlab-ci.yml
> -F: .gitlab-ci.d/crossbuilds.yml
> -F: .gitlab-ci.d/*py
> -F: scripts/ci/gitlab-pipeline-status
> -
>  Guest Test Compilation Support
>  M: Alex Bennée <alex.bennee@linaro.org>
>  R: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Thomas Huth]

On 08/03/2021 17.35, Philippe Mathieu-Daudé wrote:
> On 3/8/21 4:46 PM, Thomas Huth wrote:
>> The status of the gitlab-CI files is currently somewhat confusing, and
>> it is often not quite clear whether a patch should go via my tree or
>> via the testing tree of Alex. That situation has grown historically...
>> Initially, I was the only one using the gitlab-CI, just for my private
>> repository there. But in the course of time, the gitlab-CI switched to
>> use the containers from tests/docker/ (which is not part of the gitlab-CI
>> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
>> completely for the repository and will soon use it as its gating CI, too,
>> so it makes way more sense if the gitlab-ci.yml files belong to the people
>> who are owning the qemu-project on gitlab.com and take care of the gitlab
>> CI there. Thus let's merge the gitlab-ci section into the common "test and
>> build automation" section.
>>
>> While we're at it, I'm also removing the line with Fam there for now,
>> since he was hardly active during the last years in this area anymore.
>> If he ever gets more time for this part again in the future, we surely
>> can add the line back again.
>>
>> Now to avoid that Alex is listed here alone, Philippe and I agreed to
>> help as backup maintainers here, too.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   v2: Keep Philippe and myself as maintainer instead of reviewer
>>
>>   MAINTAINERS | 21 +++++++--------------
>>   1 file changed, 7 insertions(+), 14 deletions(-)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 26c9454823..5c4c179abb 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>>   
>>   Build and test automation
>>   -------------------------
>> -Build and test automation
>> +Build and test automation, Linux Continuous Integration
> 
> I'd rather not limit it to Linux hosts...
> 
>>   M: Alex Bennée <alex.bennee@linaro.org>
>> -M: Fam Zheng <fam@euphon.net>
> 
> I'm not sure about Fam removal, he is the one maintaining patchew
> (see [*] below)... Maybe we need an Ack from Paolo?

We could split the Patchew part into a separate section... OTOH, there are 
no patchew related files in the main git repo anyway that we track in the 
MAINTAINERS file, so maybe it makes more sense to simply remove that line? 
(Patchew admins are already mentioned here: 
https://wiki.qemu.org/AdminContacts )

  Thomas

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Wainer dos Santos Moschetta]

On 3/8/21 12:46 PM, Thomas Huth wrote:
> The status of the gitlab-CI files is currently somewhat confusing, and
> it is often not quite clear whether a patch should go via my tree or
> via the testing tree of Alex. That situation has grown historically...
> Initially, I was the only one using the gitlab-CI, just for my private
> repository there. But in the course of time, the gitlab-CI switched to
> use the containers from tests/docker/ (which is not part of the gitlab-CI
> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
> completely for the repository and will soon use it as its gating CI, too,
> so it makes way more sense if the gitlab-ci.yml files belong to the people
> who are owning the qemu-project on gitlab.com and take care of the gitlab
> CI there. Thus let's merge the gitlab-ci section into the common "test and
> build automation" section.
>
> While we're at it, I'm also removing the line with Fam there for now,
> since he was hardly active during the last years in this area anymore.
> If he ever gets more time for this part again in the future, we surely
> can add the line back again.
>
> Now to avoid that Alex is listed here alone, Philippe and I agreed to
> help as backup maintainers here, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   v2: Keep Philippe and myself as maintainer instead of reviewer
>
>   MAINTAINERS | 21 +++++++--------------
>   1 file changed, 7 insertions(+), 14 deletions(-)


Acked-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 26c9454823..5c4c179abb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>   
>   Build and test automation
>   -------------------------
> -Build and test automation
> +Build and test automation, Linux Continuous Integration
>   M: Alex Bennée <alex.bennee@linaro.org>
> -M: Fam Zheng <fam@euphon.net>
> -R: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Thomas Huth <thuth@redhat.com>
> +R: Wainer dos Santos Moschetta <wainersm@redhat.com>
>   S: Maintained
>   F: .github/lockdown.yml
> +F: .gitlab-ci.yml
> +F: .gitlab-ci.d/
>   F: .travis.yml
>   F: scripts/ci/
>   F: tests/docker/
>   F: tests/vm/
>   F: scripts/archive-source.sh
> +W: https://gitlab.com/qemu-project/qemu/pipelines
>   W: https://travis-ci.org/qemu/qemu
>   W: http://patchew.org/QEMU/
>   
> @@ -3289,17 +3293,6 @@ S: Maintained
>   F: .cirrus.yml
>   W: https://cirrus-ci.com/github/qemu/qemu
>   
> -GitLab Continuous Integration
> -M: Thomas Huth <thuth@redhat.com>
> -M: Philippe Mathieu-Daudé <philmd@redhat.com>
> -M: Alex Bennée <alex.bennee@linaro.org>
> -R: Wainer dos Santos Moschetta <wainersm@redhat.com>
> -S: Maintained
> -F: .gitlab-ci.yml
> -F: .gitlab-ci.d/crossbuilds.yml
> -F: .gitlab-ci.d/*py
> -F: scripts/ci/gitlab-pipeline-status
> -
>   Guest Test Compilation Support
>   M: Alex Bennée <alex.bennee@linaro.org>
>   R: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Willian Rampazzo]

On Mon, Mar 8, 2021 at 12:46 PM Thomas Huth <thuth@redhat.com> wrote:
>
> The status of the gitlab-CI files is currently somewhat confusing, and
> it is often not quite clear whether a patch should go via my tree or
> via the testing tree of Alex. That situation has grown historically...
> Initially, I was the only one using the gitlab-CI, just for my private
> repository there. But in the course of time, the gitlab-CI switched to
> use the containers from tests/docker/ (which is not part of the gitlab-CI
> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
> completely for the repository and will soon use it as its gating CI, too,
> so it makes way more sense if the gitlab-ci.yml files belong to the people
> who are owning the qemu-project on gitlab.com and take care of the gitlab
> CI there. Thus let's merge the gitlab-ci section into the common "test and
> build automation" section.

Makes sense to me.

Acked-by: Willian Rampazzo <willianr@redhat.com>

>
> While we're at it, I'm also removing the line with Fam there for now,
> since he was hardly active during the last years in this area anymore.
> If he ever gets more time for this part again in the future, we surely
> can add the line back again.
>
> Now to avoid that Alex is listed here alone, Philippe and I agreed to
> help as backup maintainers here, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Keep Philippe and myself as maintainer instead of reviewer
>
>  MAINTAINERS | 21 +++++++--------------
>  1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 26c9454823..5c4c179abb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>
>  Build and test automation
>  -------------------------
> -Build and test automation
> +Build and test automation, Linux Continuous Integration
>  M: Alex Bennée <alex.bennee@linaro.org>
> -M: Fam Zheng <fam@euphon.net>
> -R: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Thomas Huth <thuth@redhat.com>
> +R: Wainer dos Santos Moschetta <wainersm@redhat.com>

Feel free to add me as a Reviewer: Willian Rampazzo <willianr@redhat.com>

>  S: Maintained
>  F: .github/lockdown.yml
> +F: .gitlab-ci.yml
> +F: .gitlab-ci.d/
>  F: .travis.yml
>  F: scripts/ci/
>  F: tests/docker/
>  F: tests/vm/
>  F: scripts/archive-source.sh
> +W: https://gitlab.com/qemu-project/qemu/pipelines
>  W: https://travis-ci.org/qemu/qemu
>  W: http://patchew.org/QEMU/
>
> @@ -3289,17 +3293,6 @@ S: Maintained
>  F: .cirrus.yml
>  W: https://cirrus-ci.com/github/qemu/qemu
>
> -GitLab Continuous Integration
> -M: Thomas Huth <thuth@redhat.com>
> -M: Philippe Mathieu-Daudé <philmd@redhat.com>
> -M: Alex Bennée <alex.bennee@linaro.org>
> -R: Wainer dos Santos Moschetta <wainersm@redhat.com>
> -S: Maintained
> -F: .gitlab-ci.yml
> -F: .gitlab-ci.d/crossbuilds.yml
> -F: .gitlab-ci.d/*py
> -F: scripts/ci/gitlab-pipeline-status
> -
>  Guest Test Compilation Support
>  M: Alex Bennée <alex.bennee@linaro.org>
>  R: Philippe Mathieu-Daudé <f4bug@amsat.org>
> --
> 2.27.0
>

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Philippe Mathieu-Daudé]

On 3/8/21 6:01 PM, Thomas Huth wrote:
> On 08/03/2021 17.35, Philippe Mathieu-Daudé wrote:
>> On 3/8/21 4:46 PM, Thomas Huth wrote:
>>> The status of the gitlab-CI files is currently somewhat confusing, and
>>> it is often not quite clear whether a patch should go via my tree or
>>> via the testing tree of Alex. That situation has grown historically...
>>> Initially, I was the only one using the gitlab-CI, just for my private
>>> repository there. But in the course of time, the gitlab-CI switched to
>>> use the containers from tests/docker/ (which is not part of the
>>> gitlab-CI
>>> section in the MAINTAINERS file), and QEMU now even switched to
>>> gitlab.com
>>> completely for the repository and will soon use it as its gating CI,
>>> too,
>>> so it makes way more sense if the gitlab-ci.yml files belong to the
>>> people
>>> who are owning the qemu-project on gitlab.com and take care of the
>>> gitlab
>>> CI there. Thus let's merge the gitlab-ci section into the common
>>> "test and
>>> build automation" section.
>>>
>>> While we're at it, I'm also removing the line with Fam there for now,
>>> since he was hardly active during the last years in this area anymore.
>>> If he ever gets more time for this part again in the future, we surely
>>> can add the line back again.
>>>
>>> Now to avoid that Alex is listed here alone, Philippe and I agreed to
>>> help as backup maintainers here, too.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   v2: Keep Philippe and myself as maintainer instead of reviewer
>>>
>>>   MAINTAINERS | 21 +++++++--------------
>>>   1 file changed, 7 insertions(+), 14 deletions(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 26c9454823..5c4c179abb 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>>>     Build and test automation
>>>   -------------------------
>>> -Build and test automation
>>> +Build and test automation, Linux Continuous Integration
>>
>> I'd rather not limit it to Linux hosts...
>>
>>>   M: Alex Bennée <alex.bennee@linaro.org>
>>> -M: Fam Zheng <fam@euphon.net>
>>
>> I'm not sure about Fam removal, he is the one maintaining patchew
>> (see [*] below)... Maybe we need an Ack from Paolo?
> 
> We could split the Patchew part into a separate section... OTOH, there
> are no patchew related files in the main git repo anyway that we track
> in the MAINTAINERS file, so maybe it makes more sense to simply remove
> that line? (Patchew admins are already mentioned here:
> https://wiki.qemu.org/AdminContacts )

Also here:
https://wiki.qemu.org/Testing/CI

So it makes sense to me to remove the patchew line.

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Philippe Mathieu-Daudé]

On 3/8/21 6:49 PM, Willian Rampazzo wrote:
> On Mon, Mar 8, 2021 at 12:46 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> The status of the gitlab-CI files is currently somewhat confusing, and
>> it is often not quite clear whether a patch should go via my tree or
>> via the testing tree of Alex. That situation has grown historically...
>> Initially, I was the only one using the gitlab-CI, just for my private
>> repository there. But in the course of time, the gitlab-CI switched to
>> use the containers from tests/docker/ (which is not part of the gitlab-CI
>> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
>> completely for the repository and will soon use it as its gating CI, too,
>> so it makes way more sense if the gitlab-ci.yml files belong to the people
>> who are owning the qemu-project on gitlab.com and take care of the gitlab
>> CI there. Thus let's merge the gitlab-ci section into the common "test and
>> build automation" section.
> 
> Makes sense to me.
> 
> Acked-by: Willian Rampazzo <willianr@redhat.com>
> 
>>
>> While we're at it, I'm also removing the line with Fam there for now,
>> since he was hardly active during the last years in this area anymore.
>> If he ever gets more time for this part again in the future, we surely
>> can add the line back again.
>>
>> Now to avoid that Alex is listed here alone, Philippe and I agreed to
>> help as backup maintainers here, too.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  v2: Keep Philippe and myself as maintainer instead of reviewer
>>
>>  MAINTAINERS | 21 +++++++--------------
>>  1 file changed, 7 insertions(+), 14 deletions(-)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 26c9454823..5c4c179abb 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>>
>>  Build and test automation
>>  -------------------------
>> -Build and test automation
>> +Build and test automation, Linux Continuous Integration
>>  M: Alex Bennée <alex.bennee@linaro.org>
>> -M: Fam Zheng <fam@euphon.net>
>> -R: Philippe Mathieu-Daudé <philmd@redhat.com>
>> +M: Philippe Mathieu-Daudé <philmd@redhat.com>
>> +M: Thomas Huth <thuth@redhat.com>
>> +R: Wainer dos Santos Moschetta <wainersm@redhat.com>
> 
> Feel free to add me as a Reviewer: Willian Rampazzo <willianr@redhat.com>

Thank you Willian! :)

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> The status of the gitlab-CI files is currently somewhat confusing, and
> it is often not quite clear whether a patch should go via my tree or
> via the testing tree of Alex. That situation has grown historically...
> Initially, I was the only one using the gitlab-CI, just for my private
> repository there. But in the course of time, the gitlab-CI switched to
> use the containers from tests/docker/ (which is not part of the gitlab-CI
> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
> completely for the repository and will soon use it as its gating CI, too,
> so it makes way more sense if the gitlab-ci.yml files belong to the people
> who are owning the qemu-project on gitlab.com and take care of the gitlab
> CI there. Thus let's merge the gitlab-ci section into the common "test and
> build automation" section.
>
> While we're at it, I'm also removing the line with Fam there for now,
> since he was hardly active during the last years in this area anymore.
> If he ever gets more time for this part again in the future, we surely
> can add the line back again.
>
> Now to avoid that Alex is listed here alone, Philippe and I agreed to
> help as backup maintainers here, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Pending changes requested by the others:

Acked-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée

Re: [PATCH v2] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section

[Fam Zheng]

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

My time on QEMU is rather limited and I could hardly look at testing
patches for long. So it makes sense to drop me.

Acked-by: Fam Zheng <fam@euphon.net>

Thanks!
Fam

On Mon, 8 Mar 2021 at 15:50, Thomas Huth <thuth@redhat.com> wrote:

> The status of the gitlab-CI files is currently somewhat confusing, and
> it is often not quite clear whether a patch should go via my tree or
> via the testing tree of Alex. That situation has grown historically...
> Initially, I was the only one using the gitlab-CI, just for my private
> repository there. But in the course of time, the gitlab-CI switched to
> use the containers from tests/docker/ (which is not part of the gitlab-CI
> section in the MAINTAINERS file), and QEMU now even switched to gitlab.com
> completely for the repository and will soon use it as its gating CI, too,
> so it makes way more sense if the gitlab-ci.yml files belong to the people
> who are owning the qemu-project on gitlab.com and take care of the gitlab
> CI there. Thus let's merge the gitlab-ci section into the common "test and
> build automation" section.
>
> While we're at it, I'm also removing the line with Fam there for now,
> since he was hardly active during the last years in this area anymore.
> If he ever gets more time for this part again in the future, we surely
> can add the line back again.
>
> Now to avoid that Alex is listed here alone, Philippe and I agreed to
> help as backup maintainers here, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Keep Philippe and myself as maintainer instead of reviewer
>
>  MAINTAINERS | 21 +++++++--------------
>  1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 26c9454823..5c4c179abb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3262,17 +3262,21 @@ F: include/hw/remote/iohub.h
>
>  Build and test automation
>  -------------------------
> -Build and test automation
> +Build and test automation, Linux Continuous Integration
>  M: Alex Bennée <alex.bennee@linaro.org>
> -M: Fam Zheng <fam@euphon.net>
> -R: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Philippe Mathieu-Daudé <philmd@redhat.com>
> +M: Thomas Huth <thuth@redhat.com>
> +R: Wainer dos Santos Moschetta <wainersm@redhat.com>
>  S: Maintained
>  F: .github/lockdown.yml
> +F: .gitlab-ci.yml
> +F: .gitlab-ci.d/
>  F: .travis.yml
>  F: scripts/ci/
>  F: tests/docker/
>  F: tests/vm/
>  F: scripts/archive-source.sh
> +W: https://gitlab.com/qemu-project/qemu/pipelines
>  W: https://travis-ci.org/qemu/qemu
>  W: http://patchew.org/QEMU/
>
> @@ -3289,17 +3293,6 @@ S: Maintained
>  F: .cirrus.yml
>  W: https://cirrus-ci.com/github/qemu/qemu
>
> -GitLab Continuous Integration
> -M: Thomas Huth <thuth@redhat.com>
> -M: Philippe Mathieu-Daudé <philmd@redhat.com>
> -M: Alex Bennée <alex.bennee@linaro.org>
> -R: Wainer dos Santos Moschetta <wainersm@redhat.com>
> -S: Maintained
> -F: .gitlab-ci.yml
> -F: .gitlab-ci.d/crossbuilds.yml
> -F: .gitlab-ci.d/*py
> -F: scripts/ci/gitlab-pipeline-status
> -
>  Guest Test Compilation Support
>  M: Alex Bennée <alex.bennee@linaro.org>
>  R: Philippe Mathieu-Daudé <f4bug@amsat.org>
> --
> 2.27.0
>
>
>

[-- Attachment #2: Type: text/html, Size: 5143 bytes --]