[v1] gitlab: disable accelerated zlib for s390x

[RFC PATCH] gitlab: disable accelerated zlib for s390x

Alex Bennée posted 1 patch 2 years, 1 month ago

Diff against v2
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220321133905.3278054-1-alex.bennee@linaro.org

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Cornelia Huck <cohuck@redhat.com>

There is a newer version of this series

.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)

Expand all Fold all

[RFC PATCH] gitlab: disable accelerated zlib for s390x

Posted by Alex Bennée 2 years, 1 month ago

Apparently this causes problems with migration.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
---
 .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
index 0333872113..4f292a8a5b 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
@@ -8,6 +8,8 @@ ubuntu-20.04-s390x-all-linux-static:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
  - if: "$S390X_RUNNER_AVAILABLE"
@@ -27,6 +29,8 @@ ubuntu-20.04-s390x-all:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
  - if: "$S390X_RUNNER_AVAILABLE"
@@ -43,6 +47,8 @@ ubuntu-20.04-s390x-alldbg:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -64,6 +70,8 @@ ubuntu-20.04-s390x-clang:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -84,6 +92,8 @@ ubuntu-20.04-s390x-tci:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -103,6 +113,8 @@ ubuntu-20.04-s390x-notcg:
  tags:
  - ubuntu_20.04
  - s390x
+ variables:
+    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
-- 
2.30.2

Re: [RFC PATCH] gitlab: disable accelerated zlib for s390x

Posted by Peter Maydell 2 years, 1 month ago

On Mon, 21 Mar 2022 at 13:39, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> Apparently this causes problems with migration.

More specifically:

# There appears to be a bug in the s390 hardware-accelerated version
# of zlib distributed with Ubuntu 20.04, which makes our test
# /i386/migration/multifd/tcp/zlib hit an assertion perhaps one
# time in 10. Fortunately zlib provides an escape hatch
# where we can disable the hardware-acceleration entirely by
# setting the environment variable DFLTCC to 0. Do this on all
# our CI which runs on s390 hosts, both our custom gitlab runner
# and also the Travis hosts.

...speaking of which, this patch seems to only be
touching the gitlab CI and not the travis config.

thanks
-- PMM