The following changes since commit 2ab2dad01f6dc3667c0d53d2b1ba46b511031207:

  Merge remote-tracking branch 'remotes/kraxel/tags/input-20210526-pull-request' into staging (2021-05-26 15:27:20 +0100)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/gitlab-ci-20210526

for you to fetch changes up to 740890e8935fff09023bb34c52e74ab1d539b775:

  gitlab: Split gprof-gcov job (2021-05-26 23:01:47 +0200)

----------------------------------------------------------------
GitLab CI patches queue

- Explode .gitlab-ci.yml in reusable templates
- Add job to cross build/test TCI on i386 host
- Remove CentOS 7 linux-user build job
- Split gprof-gcov job
- Temporarily set Avocado-based jobs in manual mode
- Increase time to hold Avocado reports to 1 week

----------------------------------------------------------------

Daniel P. Berrangé (1):
  gitlab: Drop linux user build job for CentOS 7

Philippe Mathieu-Daudé (16):
  gitlab: Replace YAML anchors by extends (acceptance_test_job)
  gitlab: Extract container job template to container-template.yml
  gitlab: Extract crossbuild job templates to crossbuild-template.yml
  gitlab: Extract DCO/style check jobs to static_checks.yml
  gitlab: Extract build stages to stages.yml
  gitlab: Extract default build/test jobs templates
  gitlab: Extract core container jobs to container-core.yml
  gitlab: Extract all default build/test jobs to buildtest.yml
  gitlab: Move current job set to qemu-project.yml
  gitlab: Document how forks can use different set of jobs
  gitlab: Extract cross-container jobs to container-cross.yml
  gitlab: Keep Avocado reports during 1 week
  gitlab: Run Avocado tests manually (except mainstream CI)
  gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master'
  gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax
  gitlab: Split gprof-gcov job

Richard Henderson (2):
  gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS
  gitlab: Enable cross-i386 builds of TCI

 .gitlab-ci.d/buildtest-template.yml  |  81 +++
 .gitlab-ci.d/buildtest.yml           | 741 ++++++++++++++++++++++
 .gitlab-ci.d/container-core.yml      |  17 +
 .gitlab-ci.d/container-cross.yml     | 192 ++++++
 .gitlab-ci.d/container-template.yml  |  21 +
 .gitlab-ci.d/containers.yml          | 232 +------
 .gitlab-ci.d/crossbuild-template.yml |  41 ++
 .gitlab-ci.d/crossbuilds.yml         |  60 +-
 .gitlab-ci.d/qemu-project.yml        |  11 +
 .gitlab-ci.d/stages.yml              |   8 +
 .gitlab-ci.d/static_checks.yml       |  26 +
 .gitlab-ci.yml                       | 889 ++-------------------------
 12 files changed, 1193 insertions(+), 1126 deletions(-)
 create mode 100644 .gitlab-ci.d/buildtest-template.yml
 create mode 100644 .gitlab-ci.d/buildtest.yml
 create mode 100644 .gitlab-ci.d/container-core.yml
 create mode 100644 .gitlab-ci.d/container-cross.yml
 create mode 100644 .gitlab-ci.d/container-template.yml
 create mode 100644 .gitlab-ci.d/crossbuild-template.yml
 create mode 100644 .gitlab-ci.d/qemu-project.yml
 create mode 100644 .gitlab-ci.d/stages.yml
 create mode 100644 .gitlab-ci.d/static_checks.yml

-- 
2.26.3

On Wed, 26 May 2021 at 22:27, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The following changes since commit 2ab2dad01f6dc3667c0d53d2b1ba46b511031207:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/input-20210526-pull-request' into staging (2021-05-26 15:27:20 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/philmd/qemu.git tags/gitlab-ci-20210526
>
> for you to fetch changes up to 740890e8935fff09023bb34c52e74ab1d539b775:
>
>   gitlab: Split gprof-gcov job (2021-05-26 23:01:47 +0200)
>
> ----------------------------------------------------------------
> GitLab CI patches queue
>
> - Explode .gitlab-ci.yml in reusable templates
> - Add job to cross build/test TCI on i386 host
> - Remove CentOS 7 linux-user build job
> - Split gprof-gcov job
> - Temporarily set Avocado-based jobs in manual mode
> - Increase time to hold Avocado reports to 1 week
>

Conflict in .gitlab-ci.yml -- can you fix up and resend, please?

thanks
-- PMM

On 5/27/21 3:56 PM, Peter Maydell wrote:
> On Wed, 26 May 2021 at 22:27, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> The following changes since commit 2ab2dad01f6dc3667c0d53d2b1ba46b511031207:
>>
>>   Merge remote-tracking branch 'remotes/kraxel/tags/input-20210526-pull-request' into staging (2021-05-26 15:27:20 +0100)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/philmd/qemu.git tags/gitlab-ci-20210526
>>
>> for you to fetch changes up to 740890e8935fff09023bb34c52e74ab1d539b775:
>>
>>   gitlab: Split gprof-gcov job (2021-05-26 23:01:47 +0200)
>>
>> ----------------------------------------------------------------
>> GitLab CI patches queue
>>
>> - Explode .gitlab-ci.yml in reusable templates
>> - Add job to cross build/test TCI on i386 host
>> - Remove CentOS 7 linux-user build job
>> - Split gprof-gcov job
>> - Temporarily set Avocado-based jobs in manual mode
>> - Increase time to hold Avocado reports to 1 week
>>
> 
> Conflict in .gitlab-ci.yml -- can you fix up and resend, please?

Paolo won the race by few minutes and commited 7cf333a3726
("gitlab-ci: use --meson=git for CFI jobs").

Sent v2 fixed.

Regards,

Phil.