[Qemu-commits] [qemu/qemu] 9ada9f: docs: Document GitLab custom CI/CD variables

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 9ada9fd2593716cc1c61f2d56bb84bef12056cb1
      
https://github.com/qemu/qemu/commit/9ada9fd2593716cc1c61f2d56bb84bef12056cb1
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.yml
    M docs/devel/ci.rst

  Log Message:
  -----------
  docs: Document GitLab custom CI/CD variables

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf
("gitlab: Run Avocado tests manually (except mainstream CI)"), but
forgot to document it properly. Do it now.

Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210727142431.1672530-2-philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d3a4e41da25e55b327cc8092f97a6cf02d0b5227
      
https://github.com/qemu/qemu/commit/d3a4e41da25e55b327cc8092f97a6cf02d0b5227
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml

  Log Message:
  -----------
  gitlab-ci: Fix 'when:' condition in acceptance_test_job_template

Jobs depending on another should not use the 'when: always'
condition, because if a dependency failed we should not keep
running jobs depending on it. The correct condition is
'when: on_success'.

Fixes: f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)")
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210727142431.1672530-3-philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 59e8b62b22062e8849429bf1e9cfde6f0affb83c
      
https://github.com/qemu/qemu/commit/59e8b62b22062e8849429bf1e9cfde6f0affb83c
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/edk2.yml

  Log Message:
  -----------
  gitlab-ci: Fix 'when:' condition in EDK2 jobs

Jobs depending on another should not use the 'when: always'
condition, because if a dependency failed we should not keep
running jobs depending on it. The correct condition is
'when: on_success'.

Fixes: 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries")
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210727142431.1672530-4-philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: c217fd8e36a1d619956f550e8a39528a855de2f5
      
https://github.com/qemu/qemu/commit/c217fd8e36a1d619956f550e8a39528a855de2f5
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/opensbi.yml

  Log Message:
  -----------
  gitlab-ci: Fix 'when:' condition in OpenSBI jobs

Jobs depending on another should not use the 'when: always'
condition, because if a dependency failed we should not keep
running jobs depending on it. The correct condition is
'when: on_success'.

Fixes: c6fc0fc1a71 ("gitlab-ci.yml: Add jobs to build OpenSBI firmware 
binaries")
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210727142431.1672530-5-philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: db1e119238f94d68727279d7606c5fc096de1de1
      
https://github.com/qemu/qemu/commit/db1e119238f94d68727279d7606c5fc096de1de1
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml

  Log Message:
  -----------
  gitlab-ci.d/buildtest: Disable iotests 197 and 215

The iotests 197 and 215 are occasionally failing in the gitlab-CI now.
According to the log, the failure is "./common.rc: Killed" which might
be an indication that the process has been killed due to out-of-memory
reasons. Both tests are doing a big read with 2G that likely causes
this issue. It used to work fine in the gitlab-CI in the past, but
either the program is now requiring more free memory, or the the CI
containers have changed, so that the OOM condition now sometimes occurs.

Anyway, these two tests are not really suitable for CI containers if
they are doing things like huge reads (which is likely also the reason
why they haven't been added to the "auto" group in the past), so let's
simply disable them in the gitlab-CI now, too.

Message-Id: <20210727162542.318882-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e37264ebe34fe80f7ef3ac649408fd7845c82c65
      
https://github.com/qemu/qemu/commit/e37264ebe34fe80f7ef3ac649408fd7845c82c65
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml

  Log Message:
  -----------
  gitlab-ci.d/buildtest: Mark the aarch64 and ppc64-s390x CFI jobs as manual

These two jobs are currently failing very often - the linker seems to
get killed due to out-of-memory problems. Since apparently nobody has
currently an idea how to fix that nicely, let's mark the jobs as manual
for the time being until someone comes up with a proper fix.

Message-Id: <20210728075141.400816-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: c5dd0f03423c8b614147778547a3a58525d9eb94
      
https://github.com/qemu/qemu/commit/c5dd0f03423c8b614147778547a3a58525d9eb94
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/custom-runners.yml

  Log Message:
  -----------
  gitlab-ci.d/custom-runners: Improve rules for the staging branch

If maintainers are currently pushing to a branch called "staging"
in their repository, they are ending up with some stuck jobs - unless
they have a s390x CI runner machine available. That's ugly, we should
make sure that the related jobs are really only started if such a
runner is available. So let's only run these jobs if it's the
"staging" branch of the main repository of the QEMU project (where
we can be sure that the s390x runner is available), or if the user
explicitly set a S390X_RUNNER_AVAILABLE variable in their CI configs
to declare that they have such a runner available, too.

Fixes: 4799c21023 ("Jobs based on custom runners: add job definitions ...")
Message-Id: <20210728173857.497523-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 61c32485b7920ecb25875561528778fbd3a7ad16
      
https://github.com/qemu/qemu/commit/61c32485b7920ecb25875561528778fbd3a7ad16
  Author: Peter Xu <peterx@redhat.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests: Fix migration-test build failure for sparc

Even if <linux/kvm.h> seems to exist for all archs on linux, however including
it with __linux__ defined seems to be not working yet as it'll try to include
asm/kvm.h and that can be missing for archs that do not support kvm.

To fix this (instead of any attempt to fix linux headers..), we can mark the
header to be x86_64 only, because it's so far only service for adding the kvm
dirty ring test.

Fixes: 1f546b709d6 ("tests: migration-test: Add dirty ring test")
Reported-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20210728214128.206198-1-peterx@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b8ee198d21c4bab41b8cb8d1729a956d9f648997
      
https://github.com/qemu/qemu/commit/b8ee198d21c4bab41b8cb8d1729a956d9f648997
  Author: Richard Zak <richard.j.zak@gmail.com>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure script fix for Haiku

Haiku does not support compiling with -fpie. See the discussion here
for details:

 https://discuss.haiku-os.org/t/qemu-on-haiku-sdl-issue/10961/6?u=rjzak

Signed-off-by: Richard Zak <richard.j.zak@gmail.com>
Message-Id: <CAOakUfM8zMpYiAEn-_f9s1DHdVB-Bq9fGMM=Hfr8hJW9ra6aWw@mail.gmail.com>
[thuth: Tweaked title and patch description]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3521ade3510eb5cefb2e27a101667f25dad89935
      
https://github.com/qemu/qemu/commit/3521ade3510eb5cefb2e27a101667f25dad89935
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-29 (Thu, 29 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/custom-runners.yml
    M .gitlab-ci.d/edk2.yml
    M .gitlab-ci.d/opensbi.yml
    M .gitlab-ci.yml
    M configure
    M docs/devel/ci.rst
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging

* Document GitLab custom CI/CD variables
* Fix 'when:' condition in gitlab-CI jobs
* Disable tests in the gitlab-CI that fail due to out-of-memory conditions
* Allow pushing to "staging" again for maintainers without s390x access
* Fix migration-test build failure on SPARC
* Compile without "pie" on Haiku

# gpg: Signature made Thu 29 Jul 2021 07:17:17 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/thuth-gitlab/tags/pull-request-2021-07-29:
  configure script fix for Haiku
  tests: Fix migration-test build failure for sparc
  gitlab-ci.d/custom-runners: Improve rules for the staging branch
  gitlab-ci.d/buildtest: Mark the aarch64 and ppc64-s390x CFI jobs as manual
  gitlab-ci.d/buildtest: Disable iotests 197 and 215
  gitlab-ci: Fix 'when:' condition in OpenSBI jobs
  gitlab-ci: Fix 'when:' condition in EDK2 jobs
  gitlab-ci: Fix 'when:' condition in acceptance_test_job_template
  docs: Document GitLab custom CI/CD variables

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/efba2eebdf10...3521ade3510e