[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] ac9fd9: tests/qtest: Fix a comment typo in vh
|
From: |
Richard Henderson |
|
Subject: |
[Qemu-commits] [qemu/qemu] ac9fd9: tests/qtest: Fix a comment typo in vhost-user-test.c |
|
Date: |
Mon, 26 Jun 2023 03:43:25 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: ac9fd9b6981cdcc0da9d7de1409cb435a0fd2abf
https://github.com/qemu/qemu/commit/ac9fd9b6981cdcc0da9d7de1409cb435a0fd2abf
Author: Milan Zamazal <mzamazal@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M tests/qtest/vhost-user-test.c
Log Message:
-----------
tests/qtest: Fix a comment typo in vhost-user-test.c
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230621101710.297975-4-mzamazal@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: d4c7a56539d0bdb6fccf60af94d528613cbc7c4b
https://github.com/qemu/qemu/commit/d4c7a56539d0bdb6fccf60af94d528613cbc7c4b
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
M .gitlab-ci.d/buildtest-template.yml
M .gitlab-ci.d/buildtest.yml
M .gitlab-ci.d/container-template.yml
M .gitlab-ci.d/crossbuild-template.yml
M .gitlab-ci.d/static_checks.yml
M docs/devel/ci-jobs.rst.inc
Log Message:
-----------
gitlab: centralize the container tag name
We use a fixed container tag of 'latest' so that contributors' forks
don't end up with an ever growing number of containers as they work
on throwaway feature branches.
This fixed tag causes problems running CI upstream in stable staging
branches, however, because the stable staging branch will publish old
container content that clashes with that needed by primary staging
branch. This makes it impossible to reliably run CI pipelines in
parallel in upstream for different staging branches.
This introduces $QEMU_CI_CONTAINER_TAG global variable as a way to
change which tag container publishing uses. Initially it can be set
by contributors as a git push option if they want to override the
default use of 'latest' eg
git push gitlab <branch> -o ci.variable=QEMU_CONTAINER_TAG=fish
this is useful if contributors need to run pipelines for different
branches concurrently in their forks.
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230608164018.2520330-2-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 1ddd2ff9cd873dd7d634a0b6296e91c6583b47e3
https://github.com/qemu/qemu/commit/1ddd2ff9cd873dd7d634a0b6296e91c6583b47e3
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
M docs/devel/ci-jobs.rst.inc
Log Message:
-----------
gitlab: allow overriding name of the upstream repository
The CI rules have special logic for what happens in upstream. To enable
contributors who modify CI rules to test this logic, however, they need
to be able to override which repo is considered upstream. This
introduces the 'QEMU_CI_UPSTREAM' variable
git push gitlab <branch> -o ci.variable=QEMU_CI_UPSTREAM=berrange
to make it look as if my namespace is the actual upstream. Namespace in
this context refers to the path fragment in gitlab URLs that is above
the repository. Typically this will be the contributor's gitlab login
name.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230608164018.2520330-3-berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: e28112d00703abd136e2411d23931f4f891c9244
https://github.com/qemu/qemu/commit/e28112d00703abd136e2411d23931f4f891c9244
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
Log Message:
-----------
gitlab: stable staging branches publish containers in a separate tag
If the stable staging branches publish containers under the 'latest' tag
they will clash with containers published on the primary staging branch,
as well as with each other. This introduces logic that overrides the
container tag when jobs run against the stable staging branches.
The CI_COMMIT_REF_SLUG variable we use expands to the git branch name,
but with most special characters removed, such that it is valid as a
docker tag name. eg 'staging-8.0' will get a slug of 'staging-8-0'
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230608164018.2520330-4-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: a77ef83cf8f2a7deeb23357fc6f005695a56a81c
https://github.com/qemu/qemu/commit/a77ef83cf8f2a7deeb23357fc6f005695a56a81c
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
Log Message:
-----------
gitlab: avoid extra pipelines for tags and stable branches
In upstream context we only run pipelines on staging branches, and
limited publishing jobs on the default branch.
We don't want to run pipelines on stable branches, or tags, because
the content will have already been tested on a staging branch before
getting pushed.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230608164018.2520330-5-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 49ac76c2a0ef4a49a4d259fff28829c0a7ce8458
https://github.com/qemu/qemu/commit/49ac76c2a0ef4a49a4d259fff28829c0a7ce8458
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
Log Message:
-----------
gitlab: support disabling job auto-run in upstream
In forks QEMU_CI=1 can be used to create a pipeline but not auto-run any
jobs. In upstream jobs always auto-run, which is equiv of QEMU_CI=2.
This supports setting QEMU_CI=1 in upstream, to disable job auto-run.
This can be used to preserve CI minutes if repushing a branch to staging
with a specific fix that only needs testing in limited scenarios.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230608164018.2520330-6-berrange@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: a3fcbb47901cbf6e99ad68539867ae69ec3b605a
https://github.com/qemu/qemu/commit/a3fcbb47901cbf6e99ad68539867ae69ec3b605a
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/windows.yml
Log Message:
-----------
gitlab-ci: grab msys2 meson-logs as artifacts
Rename build directory to "build", like most other CI builds.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230620153720.514882-2-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 81a12315ade028ae356e8f2e264344b537a9715b
https://github.com/qemu/qemu/commit/81a12315ade028ae356e8f2e264344b537a9715b
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/windows.yml
Log Message:
-----------
gitlab-ci: add msys2 meson test to junit report
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230620153720.514882-3-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: b197ea8636a18b0e2968b00c3a392bfc641b51a0
https://github.com/qemu/qemu/commit/b197ea8636a18b0e2968b00c3a392bfc641b51a0
Author: Thomas Huth <thuth@redhat.com>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M tests/qtest/cxl-test.c
Log Message:
-----------
tests/qtest/cxl-test: Clean up temporary directories after testing
It's good style to clean up temporary directories when they
are not needed anymore.
Message-Id: <20230622114132.372898-1-thuth@redhat.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 52ed34cbddde1cb89b2ac263e758e349a77f21e1
https://github.com/qemu/qemu/commit/52ed34cbddde1cb89b2ac263e758e349a77f21e1
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-26 (Mon, 26 Jun 2023)
Changed paths:
M .gitlab-ci.d/base.yml
M .gitlab-ci.d/buildtest-template.yml
M .gitlab-ci.d/buildtest.yml
M .gitlab-ci.d/container-template.yml
M .gitlab-ci.d/crossbuild-template.yml
M .gitlab-ci.d/static_checks.yml
M .gitlab-ci.d/windows.yml
M docs/devel/ci-jobs.rst.inc
M tests/qtest/cxl-test.c
M tests/qtest/vhost-user-test.c
Log Message:
-----------
Merge tag 'pull-request-2023-06-26' of https://gitlab.com/thuth/qemu into
staging
* Improve gitlab-CI with regards to handling of stable staging branches
* Add msys2 gitlab-CI artifacts
* Minor qtest fixes
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmSZR6gRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWoFQ//VieL2UTOBXvw6TlMCYEpqKURdKYc7Uqp
# Y/gJRHK+EQ3C4BGzv8l/P07/H3N5da+8Y2Ta37tNritbs+tyrYVIQAY3+bugG6hO
# lIF5oUGTcbOkC6Z1ajtjHcmxCj+2Z8uumlFW44zMR4HzzcmaRDyVDoU0gUg0Ohkt
# aNdpjJEA8BRzvQTjx92v31uILk8zpd0yL+40p/2DSx0Dt5eoqTjFN4QCgqk+C9A3
# WiiIkJBIIPgfp3XScVGeKS2ZfGSL7/QcJF0wbkkLhWfuF5oBjjkQCJlGYxpAnnbv
# J7esrNCxsks7T7SC/QnEzyePMXxX1DgV9znwBtEobLTQ38LcDWpdqdr0VYgyQhdo
# 9NgBLNkI3J1JCmJ5amCLRNcmH75cMnhxXeZYsjZ70VnirgFEQS1C+YELadCY8QWa
# S3YS/ZvOc5wHFdTrsfIyJG+2AjbefyboiXojzd/sFEY0485A8malTdtn96dhHjkZ
# KvInxQHV7uoUhok1QC68taMHbRUfA6jU7STYjkgDjnf+L+ywIbbKJE7LpyicvnsU
# MUR+9H4EsSlmN2koc9bopG0sspLThviIKORqzPEo3WyBj5jCIZ7tkvUEqBUkJwx2
# hISZeqdhP+wRVR4Ter0RNywjk2gSbaYcPzlnbaRYZ5OoiRchXr+uh/X0dIdkCNPP
# YwB1Y0wBpPU=
# =4Jl2
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 26 Jun 2023 10:09:12 AM CEST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [undefined]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 'pull-request-2023-06-26' of https://gitlab.com/thuth/qemu:
tests/qtest/cxl-test: Clean up temporary directories after testing
gitlab-ci: add msys2 meson test to junit report
gitlab-ci: grab msys2 meson-logs as artifacts
gitlab: support disabling job auto-run in upstream
gitlab: avoid extra pipelines for tags and stable branches
gitlab: stable staging branches publish containers in a separate tag
gitlab: allow overriding name of the upstream repository
gitlab: centralize the container tag name
tests/qtest: Fix a comment typo in vhost-user-test.c
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Compare: https://github.com/qemu/qemu/compare/f9925abbda1c...52ed34cbddde