Currently all pipelines of the gitlab CI are failing, except for the
"build-user" pipeline. There is an issue with the default container
image (likely Debian stable) where they imported something bad in one
of the system headers:

 /usr/include/linux/swab.h: In function '__swab':
 /builds/huth/qemu/include/qemu/bitops.h:20:34: error: "sizeof" is not
  defined, evaluates to 0 [-Werror=undef]
 #define BITS_PER_LONG           (sizeof (unsigned long) * BITS_PER_BYTE)

We could maybe work-around this issue or wait for the default containers
to get fixed, but considering that we use Ubuntu (and thus Debian-style)
CI in Travis already to a very large extent, we should consider to use
some RPM-based distros in our gitlab CI instead. Thus let's change the
failing pipelines to use Fedora and CentOS (and also one Ubuntu 19.10,
since 20.04 is broken, too) now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.yml | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5208d93ff8..559ec2ab4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,17 @@ include:
 .update_apt_template: &before_script_apt
  before_script:
   - apt-get update -qq
-  - apt-get install -y -qq libglib2.0-dev libpixman-1-dev genisoimage
+  - apt-get install -y -qq git gcc libglib2.0-dev libpixman-1-dev make
+        genisoimage
+
+.update_dnf_template: &before_script_dnf
+ before_script:
+  - dnf update -y
+  - dnf install -y bzip2 diffutils gcc git genisoimage findutils glib2-devel
+        make python3 perl-podlators perl-Test-Harness pixman-devel zlib-devel
 
 build-system1:
+ image: ubuntu:19.10
  <<: *before_script_apt
  script:
  - apt-get install -y -qq libgtk-3-dev libvte-dev nettle-dev libcacard-dev
@@ -21,11 +29,12 @@ build-system1:
  - make -j2 check
 
 build-system2:
- <<: *before_script_apt
+ image: fedora:latest
+ <<: *before_script_dnf
  script:
- - apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev
-      libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev
-      libzstd-dev
+ - yum install -y SDL2-devel libgcrypt-devel brlapi-devel libaio-devel
+       libfdt-devel lzo-devel librdmacm-devel libibverbs-devel libibumad-devel
+       libzstd-devel
  - mkdir build
  - cd build
  - ../configure --enable-werror --target-list="tricore-softmmu unicore32-softmmu
@@ -35,7 +44,8 @@ build-system2:
  - make -j2 check
 
 build-disabled:
- <<: *before_script_apt
+ image: fedora:latest
+ <<: *before_script_dnf
  script:
  - mkdir build
  - cd build
@@ -50,9 +60,10 @@ build-disabled:
  - make -j2 check-qtest SPEED=slow
 
 build-tcg-disabled:
- <<: *before_script_apt
+ image: centos:8
+ <<: *before_script_dnf
  script:
- - apt-get install -y -qq clang libgtk-3-dev libusb-dev
+ - dnf install -y clang gtk3-devel libusbx-devel libgcrypt-devel
  - mkdir build
  - cd build
  - ../configure --cc=clang --enable-werror --disable-tcg --audio-drv-list=""
@@ -79,10 +90,11 @@ build-user:
  - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
 
 build-clang:
- <<: *before_script_apt
+ image: fedora:latest
+ <<: *before_script_dnf
  script:
- - apt-get install -y -qq clang libsdl2-dev libattr1-dev libcap-ng-dev
-      xfslibs-dev libiscsi-dev libnfs-dev libseccomp-dev gnutls-dev librbd-dev
+ - yum install -y clang SDL2-devel libattr-devel libcap-ng-devel xfsprogs-devel
+       libiscsi-devel libnfs-devel libseccomp-devel gnutls-devel librbd-devel
  - mkdir build
  - cd build
  - ../configure --cc=clang --cxx=clang++ --enable-werror
@@ -92,7 +104,8 @@ build-clang:
  - make -j2 check
 
 build-tci:
- <<: *before_script_apt
+ image: centos:8
+ <<: *before_script_dnf
  script:
  - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64"
  - mkdir build
-- 
2.18.1

Thomas Huth <thuth@redhat.com> writes:

> Currently all pipelines of the gitlab CI are failing, except for the
> "build-user" pipeline. There is an issue with the default container
> image (likely Debian stable) where they imported something bad in one
> of the system headers:
>
>  /usr/include/linux/swab.h: In function '__swab':
>  /builds/huth/qemu/include/qemu/bitops.h:20:34: error: "sizeof" is not
>   defined, evaluates to 0 [-Werror=undef]
>  #define BITS_PER_LONG           (sizeof (unsigned long) * BITS_PER_BYTE)
>
> We could maybe work-around this issue or wait for the default containers
> to get fixed, but considering that we use Ubuntu (and thus Debian-style)
> CI in Travis already to a very large extent, we should consider to use
> some RPM-based distros in our gitlab CI instead. Thus let's change the
> failing pipelines to use Fedora and CentOS (and also one Ubuntu 19.10,
> since 20.04 is broken, too) now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Acked-by: Alex Bennée <alex.bennee@linaro.org>

I will say Fedora/CentOS won't be immune to this failure if they update
the kernel headers to somewhere between the breakage and the fix.

> ---
>  .gitlab-ci.yml | 37 +++++++++++++++++++++++++------------
>  1 file changed, 25 insertions(+), 12 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 5208d93ff8..559ec2ab4d 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -5,9 +5,17 @@ include:
>  .update_apt_template: &before_script_apt
>   before_script:
>    - apt-get update -qq
> -  - apt-get install -y -qq libglib2.0-dev libpixman-1-dev genisoimage
> +  - apt-get install -y -qq git gcc libglib2.0-dev libpixman-1-dev make
> +        genisoimage
> +
> +.update_dnf_template: &before_script_dnf
> + before_script:
> +  - dnf update -y
> +  - dnf install -y bzip2 diffutils gcc git genisoimage findutils glib2-devel
> +        make python3 perl-podlators perl-Test-Harness pixman-devel zlib-devel
>  
>  build-system1:
> + image: ubuntu:19.10
>   <<: *before_script_apt
>   script:
>   - apt-get install -y -qq libgtk-3-dev libvte-dev nettle-dev libcacard-dev
> @@ -21,11 +29,12 @@ build-system1:
>   - make -j2 check
>  
>  build-system2:
> - <<: *before_script_apt
> + image: fedora:latest
> + <<: *before_script_dnf
>   script:
> - - apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev
> -      libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev
> -      libzstd-dev
> + - yum install -y SDL2-devel libgcrypt-devel brlapi-devel libaio-devel
> +       libfdt-devel lzo-devel librdmacm-devel libibverbs-devel libibumad-devel
> +       libzstd-devel
>   - mkdir build
>   - cd build
>   - ../configure --enable-werror --target-list="tricore-softmmu unicore32-softmmu
> @@ -35,7 +44,8 @@ build-system2:
>   - make -j2 check
>  
>  build-disabled:
> - <<: *before_script_apt
> + image: fedora:latest
> + <<: *before_script_dnf
>   script:
>   - mkdir build
>   - cd build
> @@ -50,9 +60,10 @@ build-disabled:
>   - make -j2 check-qtest SPEED=slow
>  
>  build-tcg-disabled:
> - <<: *before_script_apt
> + image: centos:8
> + <<: *before_script_dnf
>   script:
> - - apt-get install -y -qq clang libgtk-3-dev libusb-dev
> + - dnf install -y clang gtk3-devel libusbx-devel libgcrypt-devel
>   - mkdir build
>   - cd build
>   - ../configure --cc=clang --enable-werror --disable-tcg --audio-drv-list=""
> @@ -79,10 +90,11 @@ build-user:
>   - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
>  
>  build-clang:
> - <<: *before_script_apt
> + image: fedora:latest
> + <<: *before_script_dnf
>   script:
> - - apt-get install -y -qq clang libsdl2-dev libattr1-dev libcap-ng-dev
> -      xfslibs-dev libiscsi-dev libnfs-dev libseccomp-dev gnutls-dev librbd-dev
> + - yum install -y clang SDL2-devel libattr-devel libcap-ng-devel xfsprogs-devel
> +       libiscsi-devel libnfs-devel libseccomp-devel gnutls-devel librbd-devel
>   - mkdir build
>   - cd build
>   - ../configure --cc=clang --cxx=clang++ --enable-werror
> @@ -92,7 +104,8 @@ build-clang:
>   - make -j2 check
>  
>  build-tci:
> - <<: *before_script_apt
> + image: centos:8
> + <<: *before_script_dnf
>   script:
>   - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64"
>   - mkdir build


-- 
Alex Bennée