[PATCH 0/6] Updates for the .travis.yml file

[PATCH 0/6] Updates for the .travis.yml file

[Thomas Huth]

The Travis-CI has been quite neglected in recent times. I now finally
found some spare minutes to fix some issues with time-outs, clean up
some old cruft and update the jobs to a newer version of Ubuntu.

Thomas Huth (6):
  .travis.yml: Shorten the runtime of the problematic jobs
  .travis.yml: Remove the unused xfslib-dev package
  Revert ".travis.yml: Cache Avocado cache"
  .travis.yml: Update the jobs to Ubuntu 22.04
  .travis.yml: Remove the unused UNRELIABLE environment variable
  .travis.yml: Do some more testing with Clang

 .travis.yml | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

-- 
2.44.0

[PATCH 1/6] .travis.yml: Shorten the runtime of the problematic jobs

[Thomas Huth]

The "[s390x] GCC (other-system)" and the "[s390x] GCC check-tcg"
jobs are hitting the 50 minutes timeout in Travis quite frequently
since a while.

To fix it, we've got to drop a lot of the targets from the target
list in the jobs to make them work again.

With regards to the "check-tcg" test, we can move the check with
"s390x-linux-user" to the "user" job instead which also builds
the s390x-linux-user target.

And while we're at it, remove the "--enable-fdt=system" configure
switch (since this is not required nowadays anymore).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 597d151b80..a8d1e12190 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,8 +184,8 @@ jobs:
           - genisoimage
       env:
         - TEST_CMD="make check check-tcg V=1"
-        - CONFIG="--disable-containers --enable-fdt=system
-                  --target-list=${MAIN_SYSTEM_TARGETS},s390x-linux-user"
+        - CONFIG="--disable-containers
+            --target-list=hppa-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
         - UNRELIABLE=true
       script:
         - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
@@ -225,8 +225,8 @@ jobs:
           # Tests dependencies
           - genisoimage
       env:
-        - CONFIG="--disable-containers --enable-fdt=system --audio-drv-list=sdl
-                  --disable-user --target-list-exclude=${MAIN_SYSTEM_TARGETS}"
+        - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
+            --target-list=arm-softmmu,avr-softmmu,microblaze-softmmu,sh4eb-softmmu,sparc64-softmmu,xtensaeb-softmmu"
 
     - name: "[s390x] GCC (user)"
       arch: s390x
@@ -240,6 +240,7 @@ jobs:
           - flex
           - bison
       env:
+        - TEST_CMD="make check check-tcg V=1"
         - CONFIG="--disable-containers --disable-system"
 
     - name: "[s390x] Clang (disable-tcg)"
-- 
2.44.0

[PATCH 2/6] .travis.yml: Remove the unused xfslib-dev package

[Thomas Huth]

Drop the "xfslibs-dev" package which should not be necessary anymore
since commit a5730b8bd3 ("block/file-posix: Simplify the XFS_IOC_DIOINFO
handling").

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a8d1e12190..8a3ae76a7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -220,7 +220,6 @@ jobs:
           - libsnappy-dev
           - libzstd-dev
           - nettle-dev
-          - xfslibs-dev
           - ninja-build
           # Tests dependencies
           - genisoimage
-- 
2.44.0

Re: [PATCH 2/6] .travis.yml: Remove the unused xfslib-dev package

[Philippe Mathieu-Daudé]

On 20/3/24 11:41, Thomas Huth wrote:
> Drop the "xfslibs-dev" package which should not be necessary anymore
> since commit a5730b8bd3 ("block/file-posix: Simplify the XFS_IOC_DIOINFO
> handling").
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .travis.yml | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index a8d1e12190..8a3ae76a7c 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -220,7 +220,6 @@ jobs:
>             - libsnappy-dev
>             - libzstd-dev
>             - nettle-dev
> -          - xfslibs-dev
>             - ninja-build
>             # Tests dependencies
>             - genisoimage

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

The rest will be cleaned once this MR gets merged and
we re-run lcitool:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/469

[PATCH 3/6] Revert ".travis.yml: Cache Avocado cache"

[Thomas Huth]

This reverts commit c1073e44b46490133e16420e1784dec7bcd4e030.

The Avocado tests have been removed from Travis a long time ago with
commit c5008c76ee ("gitlab: add acceptance testing to system builds"),
so we don't need to cache the avocado files here anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a3ae76a7c..8da88c4360 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,6 @@ cache:
   timeout: 1200
   ccache: true
   pip: true
-  directories:
-  - $HOME/avocado/data/cache
 
 
 # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
-- 
2.44.0

[PATCH 4/6] .travis.yml: Update the jobs to Ubuntu 22.04

[Thomas Huth]

According to our support policy, we'll soon drop our official support
for Ubuntu 20.04 ("Focal Fossa") in QEMU. Thus we should update the
Travis jobs now to a newer release (Ubuntu 22.04 - "Jammy Jellyfish")
for future testing. Since all jobs are using this release now, we
can drop the entries from the individual jobs and use the global
setting again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8da88c4360..16cf706c07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 os: linux
-dist: focal
+dist: jammy
 language: c
 compiler:
   - gcc
@@ -7,7 +7,7 @@ cache:
   # There is one cache per branch and compiler version.
   # characteristics of each job are used to identify the cache:
   # - OS name (currently only linux)
-  # - OS distribution (for Linux, bionic or focal)
+  # - OS distribution (e.g. "jammy" for Linux)
   # - Names and values of visible environment variables set in .travis.yml or Settings panel
   timeout: 1200
   ccache: true
@@ -81,7 +81,6 @@ jobs:
 
     - name: "[aarch64] GCC check-tcg"
       arch: arm64
-      dist: focal
       addons:
         apt_packages:
           - libaio-dev
@@ -117,7 +116,6 @@ jobs:
 
     - name: "[ppc64] GCC check-tcg"
       arch: ppc64le
-      dist: focal
       addons:
         apt_packages:
           - libaio-dev
@@ -152,7 +150,6 @@ jobs:
 
     - name: "[s390x] GCC check-tcg"
       arch: s390x
-      dist: focal
       addons:
         apt_packages:
           - libaio-dev
@@ -197,7 +194,6 @@ jobs:
 
     - name: "[s390x] GCC (other-system)"
       arch: s390x
-      dist: focal
       addons:
         apt_packages:
           - libaio-dev
@@ -227,7 +223,6 @@ jobs:
 
     - name: "[s390x] GCC (user)"
       arch: s390x
-      dist: focal
       addons:
         apt_packages:
           - libgcrypt20-dev
@@ -242,8 +237,7 @@ jobs:
 
     - name: "[s390x] Clang (disable-tcg)"
       arch: s390x
-      dist: focal
-      compiler: clang-10
+      compiler: clang
       addons:
         apt_packages:
           - libaio-dev
@@ -269,7 +263,6 @@ jobs:
           - libvdeplug-dev
           - libvte-2.91-dev
           - ninja-build
-          - clang-10
       env:
         - TEST_CMD="make check-unit"
         - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools
-- 
2.44.0

Re: [PATCH 4/6] .travis.yml: Update the jobs to Ubuntu 22.04

[Philippe Mathieu-Daudé]

On 20/3/24 11:41, Thomas Huth wrote:
> According to our support policy, we'll soon drop our official support
> for Ubuntu 20.04 ("Focal Fossa") in QEMU. Thus we should update the
> Travis jobs now to a newer release (Ubuntu 22.04 - "Jammy Jellyfish")
> for future testing. Since all jobs are using this release now, we
> can drop the entries from the individual jobs and use the global
> setting again.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .travis.yml | 13 +++----------
>   1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 8da88c4360..16cf706c07 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -1,5 +1,5 @@
>   os: linux
> -dist: focal
> +dist: jammy

FYI Peter suggested to Alex on IRC to wait for the v9.0 release tag.

Re: [PATCH 4/6] .travis.yml: Update the jobs to Ubuntu 22.04

[Peter Maydell]

On Wed, 20 Mar 2024 at 11:13, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 20/3/24 11:41, Thomas Huth wrote:
> > According to our support policy, we'll soon drop our official support
> > for Ubuntu 20.04 ("Focal Fossa") in QEMU. Thus we should update the
> > Travis jobs now to a newer release (Ubuntu 22.04 - "Jammy Jellyfish")
> > for future testing. Since all jobs are using this release now, we
> > can drop the entries from the individual jobs and use the global
> > setting again.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >   .travis.yml | 13 +++----------
> >   1 file changed, 3 insertions(+), 10 deletions(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index 8da88c4360..16cf706c07 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -1,5 +1,5 @@
> >   os: linux
> > -dist: focal
> > +dist: jammy
>
> FYI Peter suggested to Alex on IRC to wait for the v9.0 release tag.

Yes; unless 20.04 is already no longer in our supported-platforms
list or there's some other "this is actively broken" problem, I tend
to prefer not changing the CI test platform set during freeze.

thanks
-- PMM

[PATCH 5/6] .travis.yml: Remove the unused UNRELIABLE environment variable

[Thomas Huth]

This variable was used to allow jobs to fail without spoiling the
overall result. But the required "allow_failures:" hunk has been
accidentally removed in commit 9d03f5abed ("travis.yml: Remove the
"Release tarball" job"), and it was anyway only useful while we
still had the x86 jobs here around that were our main CI jobs.
Thus let's simply remove this useless variable now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16cf706c07..7527f71c05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,7 +112,6 @@ jobs:
         - TEST_CMD="make check check-tcg V=1"
         - CONFIG="--disable-containers --enable-fdt=system
                   --target-list=${MAIN_SYSTEM_TARGETS} --cxx=/bin/false"
-        - UNRELIABLE=true
 
     - name: "[ppc64] GCC check-tcg"
       arch: ppc64le
@@ -181,7 +180,6 @@ jobs:
         - TEST_CMD="make check check-tcg V=1"
         - CONFIG="--disable-containers
             --target-list=hppa-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
-        - UNRELIABLE=true
       script:
         - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
         - |
@@ -267,4 +265,3 @@ jobs:
         - TEST_CMD="make check-unit"
         - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools
                   --enable-fdt=system --host-cc=clang --cxx=clang++"
-        - UNRELIABLE=true
-- 
2.44.0

[PATCH 6/6] .travis.yml: Do some more testing with Clang

[Thomas Huth]

We are doing a lot of cross-compilation tests with GCC in the gitlab-CI
already, so we could get some more test coverage by using Clang in the
Travis-CI instead. Thus let's switch two additional jobs to use Clang
for compilation.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7527f71c05..cef0308952 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,8 +113,9 @@ jobs:
         - CONFIG="--disable-containers --enable-fdt=system
                   --target-list=${MAIN_SYSTEM_TARGETS} --cxx=/bin/false"
 
-    - name: "[ppc64] GCC check-tcg"
+    - name: "[ppc64] Clang check-tcg"
       arch: ppc64le
+      compiler: clang
       addons:
         apt_packages:
           - libaio-dev
@@ -190,8 +191,9 @@ jobs:
               $(exit $BUILD_RC);
           fi
 
-    - name: "[s390x] GCC (other-system)"
+    - name: "[s390x] Clang (other-system)"
       arch: s390x
+      compiler: clang
       addons:
         apt_packages:
           - libaio-dev
-- 
2.44.0