Commits on Jun 26, 2023

1. 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>

   

   mz-pdm authored and huth committed Jun 26, 2023
   Copy the full SHA

   ac9fd9b View commit details

   Browse the repository at this point in the history

2. 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>

   

   berrange authored and huth committed Jun 26, 2023
   Copy the full SHA

   d4c7a56 View commit details

   Browse the repository at this point in the history

3. 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>

   

   berrange authored and huth committed Jun 26, 2023
   Copy the full SHA

   1ddd2ff View commit details

   Browse the repository at this point in the history

4. 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>

   

   berrange authored and huth committed Jun 26, 2023
   Copy the full SHA

   e28112d View commit details

   Browse the repository at this point in the history

5. 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>

   

   berrange authored and huth committed Jun 26, 2023
   Copy the full SHA

   a77ef83 View commit details

   Browse the repository at this point in the history

6. 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>

   

   berrange authored and huth committed Jun 26, 2023
   Copy the full SHA

   49ac76c View commit details

   Browse the repository at this point in the history

7. 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>

   

   elmarco authored and huth committed Jun 26, 2023
   Copy the full SHA

   a3fcbb4 View commit details

   Browse the repository at this point in the history

8. 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>

   

   elmarco authored and huth committed Jun 26, 2023
   Copy the full SHA

   81a1231 View commit details

   Browse the repository at this point in the history

9. 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>

   

   huth committed Jun 26, 2023
   Copy the full SHA

   b197ea8 View commit details

   Browse the repository at this point in the history

10. 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>

    

    rth7680 committed Jun 26, 2023
    Copy the full SHA

    52ed34c View commit details

    Browse the repository at this point in the history