[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] a4b201: gitlab: Replace YAML anchors by exten
From: |
Peter Maydell |
Subject: |
[Qemu-commits] [qemu/qemu] a4b201: gitlab: Replace YAML anchors by extends (acceptanc... |
Date: |
Thu, 27 May 2021 11:17:43 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: a4b201d1ace0d25219491ac3e14930e9539ae762
https://github.com/qemu/qemu/commit/a4b201d1ace0d25219491ac3e14930e9539ae762
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Replace YAML anchors by extends (acceptance_test_job)
'extends' is an alternative to using YAML anchors
and is a little more flexible and readable. See:
https://docs.gitlab.com/ee/ci/yaml/#extends
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-2-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: e4af2160e17ab48f49b6c18cf39de8562b390768
https://github.com/qemu/qemu/commit/e4af2160e17ab48f49b6c18cf39de8562b390768
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/crossbuilds.yml
Log Message:
-----------
gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210502235727.1979457-26-richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 840cafced12f962e7447de4333a55b67b44030a1
https://github.com/qemu/qemu/commit/840cafced12f962e7447de4333a55b67b44030a1
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/crossbuilds.yml
Log Message:
-----------
gitlab: Enable cross-i386 builds of TCI
We're currently only testing TCI with a 64-bit host -- also test
with a 32-bit host. Enable a selection of softmmu and user-only
targets, 32-bit LE, 64-bit LE, 32-bit BE, as there are ifdefs for each.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210502235727.1979457-27-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: fb3c0334dedc09994359b213df303440a8ee6edd
https://github.com/qemu/qemu/commit/fb3c0334dedc09994359b213df303440a8ee6edd
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/container-template.yml
M .gitlab-ci.d/containers.yml
Log Message:
-----------
gitlab: Extract container job template to container-template.yml
Extract the container job template to a new file
(container-template.yml) to be able to reuse it
without having to run all the jobs included, which
are mainly useful for mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-4-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: ecac85fe49793fc4102b68f03ef18d74c4c77dee
https://github.com/qemu/qemu/commit/ecac85fe49793fc4102b68f03ef18d74c4c77dee
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/crossbuild-template.yml
M .gitlab-ci.d/crossbuilds.yml
Log Message:
-----------
gitlab: Extract crossbuild job templates to crossbuild-template.yml
Extract the crossbuild job templates to a new file
(crossbuild-template.yml) to be able to reuse them
without having to run all the jobs included, which
are mainly useful for mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-5-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: f659e6584a2022473af14ac4d89f656515c25ea4
https://github.com/qemu/qemu/commit/f659e6584a2022473af14ac4d89f656515c25ea4
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/static_checks.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Extract DCO/style check jobs to static_checks.yml
Extract the DCO / checkpatch jobs to a new file (static_checks.yml)
to be able to run them without having to run all the jobs included
in the default .gitlab-ci.yml, which are mainly useful for the
mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-6-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 07df3dfafa94460082f704dab674a7911c844ba6
https://github.com/qemu/qemu/commit/07df3dfafa94460082f704dab674a7911c844ba6
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/stages.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Extract build stages to stages.yml
Extract the build stages used by our job templates to a new file
(stages.yml) to be able to include it with the other templates,
without having to run all the jobs included in the default
.gitlab-ci.yml, which are mainly useful for mainstream CI.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-7-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 6cd5251b407ab1ec7f5b8dbdc5d030ca48e4ed5c
https://github.com/qemu/qemu/commit/6cd5251b407ab1ec7f5b8dbdc5d030ca48e4ed5c
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/buildtest-template.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Extract default build/test jobs templates
To be able to reuse the mainstream build/test jobs templates,
extract them into a new file (buildtest-template.yml).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-8-f4bug@amsat.org>
[thuth: Keep the "acceptance_test_job_template" name for now]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 6b505a4e4f0dbda681c9dfbaca2fa824c341981e
https://github.com/qemu/qemu/commit/6b505a4e4f0dbda681c9dfbaca2fa824c341981e
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/container-core.yml
M .gitlab-ci.d/containers.yml
Log Message:
-----------
gitlab: Extract core container jobs to container-core.yml
It is not possible to use the previously extracted templates
without this set of core containers. Extract them into a new
file (container-core.yml) to be able to build them without
having to build all the other containers by default.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210519185504.2198573-10-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: dcaf5e8f2fab7426194f3d656cf272accd28518b
https://github.com/qemu/qemu/commit/dcaf5e8f2fab7426194f3d656cf272accd28518b
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Drop linux user build job for CentOS 7
It has been over two years since RHEL-8 was released, and thus per the
platform build policy, we no longer need to support RHEL-7 as a build
target.
The build-user-centos7 job was to detect a failure specific to CentOS
7 and there are already other linux user jobs for other platforms.
Thus we can drop this job rather than move it to CentOS 8.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210514120415.1368922-2-berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: f2f5c3e62907088df2c0540f15c00ffc5a06211b
https://github.com/qemu/qemu/commit/f2f5c3e62907088df2c0540f15c00ffc5a06211b
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/buildtest.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Extract all default build/test jobs to buildtest.yml
Extract the build/test jobs run by default on the mainstream
CI into a new file (buildtest.yml).
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210511072952.2813358-9-f4bug@amsat.org>
Commit: a151926c80c3c8c279d664ca8182c46763ca0e42
https://github.com/qemu/qemu/commit/a151926c80c3c8c279d664ca8182c46763ca0e42
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/qemu-project.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Move current job set to qemu-project.yml
To allow forks to easily decide which jobs they want to run,
but without disrupting the current default, move the current
set of jobs to a new file corresponding to the jobs run by
the mainstream project CI:
https://gitlab.com/qemu-project/qemu/-/pipelines
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210511072952.2813358-11-f4bug@amsat.org>
Commit: 8b185c815ce8c16d7dea20c5ec379f9f30f00c74
https://github.com/qemu/qemu/commit/8b185c815ce8c16d7dea20c5ec379f9f30f00c74
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Document how forks can use different set of jobs
Document how forks can use different set of jobs and add
a big warning so no new configuration is added to this
file.
Suggested-by: Daniel Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210525082556.4011380-4-f4bug@amsat.org>
Commit: 961889f00c958e5500ec13eba71fbc5ccd243fd0
https://github.com/qemu/qemu/commit/961889f00c958e5500ec13eba71fbc5ccd243fd0
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/container-cross.yml
M .gitlab-ci.d/containers.yml
Log Message:
-----------
gitlab: Extract cross-container jobs to container-cross.yml
Extract the jobs preparing the cross containers into a new file
(container-cross.yml).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210525082556.4011380-5-f4bug@amsat.org>
Commit: f230dba714e7777098ede5758d62b21922e7ec2f
https://github.com/qemu/qemu/commit/f230dba714e7777098ede5758d62b21922e7ec2f
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/buildtest-template.yml
Log Message:
-----------
gitlab: Keep Avocado reports during 1 week
Sometimes pull requests are merged during the week-end, triggering
a CI pipeline. Currently if such pipeline fails, the Avocado reports
are available for 2 days. For the reviewers working on the project
during office hours, the reports are already discarded when they
want to look at them. Increase this time to 1 week, which should
give reviewers enough time.
Only keep the reports on failure, which is the only case we'll
look at them.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210525082556.4011380-8-f4bug@amsat.org>
Commit: f56bf4caf7179c82a50e3f7618f335526fba37d3
https://github.com/qemu/qemu/commit/f56bf4caf7179c82a50e3f7618f335526fba37d3
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/buildtest-template.yml
M .gitlab-ci.yml
Log Message:
-----------
gitlab: Run Avocado tests manually (except mainstream CI)
Due to a design problem and misunderstanding between the Avocado
framework and QEMU, Avocado is fetching many asset artifacts it
shouldn't be fetching, exhausting the jobs CI timeout.
Since Avocado artifacts are cached, this is not an issue with old
forks, which already have populated the cache and do not need to
download new artifacts to run the tests.
However this is very confusing to new contributors who start to
fork the project and keep having failing CI pipelines.
As a temporary kludge, add the QEMU_CI_AVOCADO_TESTING variable
to allow old forks to keep running the Avocado tests, while still
allowing new forks to use the mainstream set of CI tests.
Keep the tests enabled by default on the mainstream namespace
which is old enough to have a populated cache, hoping we will
keep this cache long enough until the Avocado/QEMU design issue
is fixed.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210525082556.4011380-9-f4bug@amsat.org>
Commit: 1f88fad50eb7412e27e0db2c4e37cb9e982ffa80
https://github.com/qemu/qemu/commit/1f88fad50eb7412e27e0db2c4e37cb9e982ffa80
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/static_checks.yml
Log Message:
-----------
gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master'
We want to skip the checkpatch and DCO signoff jobs when
pushing to the default branch. Currently this branch is
called 'master', but we don't need to hardcode this in
the CI configuration, because the $CI_DEFAULT_BRANCH
env variable exposes it.
References:
- https://sfconservancy.org/news/2020/jun/23/gitbranchname/
- https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/
Suggested-by: Savitoj Singh <savsingh@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210525153826.4174157-1-philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Commit: 2d9e45b9cb0baa7316901238f3795a74206af457
https://github.com/qemu/qemu/commit/2d9e45b9cb0baa7316901238f3795a74206af457
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
M .gitlab-ci.d/static_checks.yml
Log Message:
-----------
gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax
Per GitLab documentation [*]:
"rules replaces only/except and they can’t be used together
in the same job."
Since the 'rules' syntax is more powerful and we are already using
it, convert the check-dco/check-patch jobs so no job use the 'only/
except' syntax.
[*] https://docs.gitlab.com/ee/ci/yaml/#rules
Inspired-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210525132418.4133235-3-f4bug@amsat.org>
Commit: c8616fc7670b884de5f74d2767aade224c1c5c3a
https://github.com/qemu/qemu/commit/c8616fc7670b884de5f74d2767aade224c1c5c3a
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-05-27 (Thu, 27 May 2021)
Changed paths:
A .gitlab-ci.d/buildtest-template.yml
A .gitlab-ci.d/buildtest.yml
A .gitlab-ci.d/container-core.yml
A .gitlab-ci.d/container-cross.yml
A .gitlab-ci.d/container-template.yml
M .gitlab-ci.d/containers.yml
A .gitlab-ci.d/crossbuild-template.yml
M .gitlab-ci.d/crossbuilds.yml
A .gitlab-ci.d/qemu-project.yml
A .gitlab-ci.d/stages.yml
A .gitlab-ci.d/static_checks.yml
M .gitlab-ci.yml
Log Message:
-----------
Merge remote-tracking branch 'remotes/philmd/tags/gitlab-ci-20210527' into
staging
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
- Temporarily set Avocado-based jobs in manual mode
- Increase time to hold Avocado reports to 1 week
# gpg: Signature made Thu 27 May 2021 15:40:58 BST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>"
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd/tags/gitlab-ci-20210527:
gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax
gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master'
gitlab: Run Avocado tests manually (except mainstream CI)
gitlab: Keep Avocado reports during 1 week
gitlab: Extract cross-container jobs to container-cross.yml
gitlab: Document how forks can use different set of jobs
gitlab: Move current job set to qemu-project.yml
gitlab: Extract all default build/test jobs to buildtest.yml
gitlab: Drop linux user build job for CentOS 7
gitlab: Extract core container jobs to container-core.yml
gitlab: Extract default build/test jobs templates
gitlab: Extract build stages to stages.yml
gitlab: Extract DCO/style check jobs to static_checks.yml
gitlab: Extract crossbuild job templates to crossbuild-template.yml
gitlab: Extract container job template to container-template.yml
gitlab: Enable cross-i386 builds of TCI
gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS
gitlab: Replace YAML anchors by extends (acceptance_test_job)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/c5847f5e4e5e...c8616fc7670b