All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs
@ 2022-03-29 10:28 Thomas Huth
  2022-03-29 10:39 ` Philippe Mathieu-Daudé
  2022-03-30  8:19 ` Daniel P. Berrangé
  0 siblings, 2 replies; 4+ messages in thread
From: Thomas Huth @ 2022-03-29 10:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: Daniel P . Berrange, Beraldo Leal, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Ed Maste, Paolo Bonzini,
	Alex Bennée, Li-Wen Hsu

The perl test harness is not necessary anymore since commit 3d2f73ef75
("build: use "meson test" as the test harness"). Thus remove it from
tests/lcitool/projects/qemu.yml, run "make lcitool-refresh" and manually
clean the remaining docker / vm files that are not managed by lcitool yet.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Note: This triggers a rebuild of the Centos-stream 8 container when
 pushed to gitlab.com - which is however currently failing due to a
 completely unrelated problem in the distro. Thus I've marked this as
 "for-7.1" for now to avoid disturbing up our 7.0 freeze phase.

 .gitlab-ci.d/cirrus/freebsd-12.vars                  | 2 +-
 .gitlab-ci.d/cirrus/freebsd-13.vars                  | 2 +-
 .gitlab-ci.d/cirrus/macos-11.vars                    | 4 ++--
 tests/docker/dockerfiles/alpine.docker               | 1 -
 tests/docker/dockerfiles/centos8.docker              | 1 -
 tests/docker/dockerfiles/debian-arm64-cross.docker   | 1 -
 tests/docker/dockerfiles/debian-s390x-cross.docker   | 1 -
 tests/docker/dockerfiles/debian-tricore-cross.docker | 1 -
 tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 -
 tests/docker/dockerfiles/fedora-win32-cross.docker   | 1 -
 tests/docker/dockerfiles/fedora-win64-cross.docker   | 1 -
 tests/docker/dockerfiles/fedora.docker               | 1 -
 tests/docker/dockerfiles/opensuse-leap.docker        | 1 -
 tests/docker/dockerfiles/ubuntu1804.docker           | 1 -
 tests/docker/dockerfiles/ubuntu2004.docker           | 1 -
 tests/lcitool/projects/qemu.yml                      | 1 -
 tests/vm/centos.aarch64                              | 3 +--
 tests/vm/fedora                                      | 2 +-
 18 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
index 07f313aa3a..b4842271b2 100644
--- a/.gitlab-ci.d/cirrus/freebsd-12.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-12.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 8a648dda1e..546a82dd75 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars
index 08183f8793..cfe9181fd4 100644
--- a/.gitlab-ci.d/cirrus/macos-11.vars
+++ b/.gitlab-ci.d/cirrus/macos-11.vars
@@ -5,12 +5,12 @@
 # https://gitlab.com/libvirt/libvirt-ci
 
 CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS='Test::Harness'
+CPAN_PKGS=''
 CROSS_PKGS=''
 MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/usr/local/bin/pip3'
-PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
+PKGS='bash bc bzip2 capstone ccache ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
 PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
 PYTHON='/usr/local/bin/python3'
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 591af43d60..3f4c0f95cb 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -73,7 +73,6 @@ RUN apk update && \
         openssh-client \
         pcre-dev \
         perl \
-        perl-test-harness \
         pixman-dev \
         pkgconf \
         pulseaudio-dev \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 3ede55d09b..4b20925bbf 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -87,7 +87,6 @@ RUN dnf update -y && \
         pam-devel \
         pcre-static \
         perl \
-        perl-Test-Harness \
         pixman-devel \
         pkgconfig \
         pulseaudio-libs-devel \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 589510a7be..b60426834c 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -29,7 +29,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             hostname \
             libpcre2-dev \
             libspice-protocol-dev \
-            libtest-harness-perl \
             llvm \
             locales \
             make \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index aa1bd6eb4c..ff79a2cc4f 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -29,7 +29,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             hostname \
             libpcre2-dev \
             libspice-protocol-dev \
-            libtest-harness-perl \
             llvm \
             locales \
             make \
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 3f6b55562c..b573b9ded2 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -25,7 +25,6 @@ RUN apt update && \
        git \
        libglib2.0-dev \
        libpixman-1-dev \
-       libtest-harness-perl \
        locales \
        make \
        ninja-build \
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 13328e6081..0a3ec346e6 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -20,7 +20,6 @@ ENV PACKAGES \
     gnutls-devel.i686 \
     nettle-devel.i686 \
     pcre-devel.i686 \
-    perl-Test-Harness \
     pixman-devel.i686 \
     sysprof-capture-devel.i686 \
     zlib-devel.i686
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index d80e66c651..84a8f5524d 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -31,7 +31,6 @@ ENV PACKAGES \
     mingw32-SDL2 \
     msitools \
     perl \
-    perl-Test-Harness \
     python3 \
     python3-PyYAML \
     tar \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 2b12b94ccf..d7ed8eb1cf 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -28,7 +28,6 @@ ENV PACKAGES \
     mingw64-pkg-config \
     msitools \
     perl \
-    perl-Test-Harness \
     python3 \
     python3-PyYAML \
     tar \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 1d01cd9440..2e6a84abfd 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -94,7 +94,6 @@ exec "$@"' > /usr/bin/nosync && \
         openssh-clients \
         pam-devel \
         pcre-static \
-        perl-Test-Harness \
         perl-base \
         pixman-devel \
         pkgconfig \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index e1ad9434a3..6f5993d602 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -83,7 +83,6 @@ RUN zypper update -y && \
            openssh \
            pam-devel \
            pcre-devel-static \
-           perl-Test-Harness \
            perl-base \
            pkgconfig \
            python3-Pillow \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 0a622b467c..b3f2156580 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -81,7 +81,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libsystemd-dev \
             libtasn1-6-dev \
-            libtest-harness-perl \
             libubsan1 \
             libudev-dev \
             libusb-1.0-0-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index b9d06cb040..a3b38884e3 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -83,7 +83,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libsystemd-dev \
             libtasn1-6-dev \
-            libtest-harness-perl \
             libubsan1 \
             libudev-dev \
             libusb-1.0-0-dev \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 958868a6ee..d068a7a8de 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -79,7 +79,6 @@ packages:
  - pam
  - pcre-static
  - perl
- - perl-Test-Harness
  - pixman
  - pkg-config
  - pulseaudio
diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64
index 81c3004c3c..96c450f8be 100755
--- a/tests/vm/centos.aarch64
+++ b/tests/vm/centos.aarch64
@@ -24,8 +24,7 @@ DEFAULT_CONFIG = {
     'cpu'          : "max",
     'machine'      : "virt,gic-version=max",
     'install_cmds' : "yum install -y make ninja-build git python3 gcc gcc-c++ flex bison, "\
-        "yum install -y glib2-devel pixman-devel zlib-devel, "\
-        "yum install -y perl-Test-Harness, "\
+        "yum install -y glib2-devel perl pixman-devel zlib-devel, "\
         "alternatives --set python /usr/bin/python3, "\
         "sudo dnf config-manager "\
         "--add-repo=https://download.docker.com/linux/centos/docker-ce.repo,"\
diff --git a/tests/vm/fedora b/tests/vm/fedora
index b977efe4a2..92b78d6e2c 100755
--- a/tests/vm/fedora
+++ b/tests/vm/fedora
@@ -35,7 +35,7 @@ class FedoraVM(basevm.BaseVM):
         'gcc', 'binutils', 'make', 'ninja-build',
 
         # perl
-        'perl-Test-Harness',
+        'perl',
 
         # libs: usb
         '"pkgconfig(libusb-1.0)"',
-- 
2.27.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs
  2022-03-29 10:28 [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs Thomas Huth
@ 2022-03-29 10:39 ` Philippe Mathieu-Daudé
  2022-03-30  8:19 ` Daniel P. Berrangé
  1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-29 10:39 UTC (permalink / raw)
  To: Thomas Huth, qemu-devel
  Cc: Daniel P . Berrange, Beraldo Leal, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Ed Maste, Paolo Bonzini,
	Alex Bennée, Li-Wen Hsu

On 29/3/22 12:28, Thomas Huth wrote:
> The perl test harness is not necessary anymore since commit 3d2f73ef75
> ("build: use "meson test" as the test harness"). Thus remove it from
> tests/lcitool/projects/qemu.yml, run "make lcitool-refresh" and manually
> clean the remaining docker / vm files that are not managed by lcitool yet.

Preferably splitting automatic/manual:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   Note: This triggers a rebuild of the Centos-stream 8 container when
>   pushed to gitlab.com - which is however currently failing due to a
>   completely unrelated problem in the distro. Thus I've marked this as
>   "for-7.1" for now to avoid disturbing up our 7.0 freeze phase.
> 
>   .gitlab-ci.d/cirrus/freebsd-12.vars                  | 2 +-
>   .gitlab-ci.d/cirrus/freebsd-13.vars                  | 2 +-
>   .gitlab-ci.d/cirrus/macos-11.vars                    | 4 ++--
>   tests/docker/dockerfiles/alpine.docker               | 1 -
>   tests/docker/dockerfiles/centos8.docker              | 1 -
>   tests/docker/dockerfiles/debian-arm64-cross.docker   | 1 -
>   tests/docker/dockerfiles/debian-s390x-cross.docker   | 1 -
>   tests/docker/dockerfiles/debian-tricore-cross.docker | 1 -
>   tests/docker/dockerfiles/fedora-i386-cross.docker    | 1 -
>   tests/docker/dockerfiles/fedora-win32-cross.docker   | 1 -
>   tests/docker/dockerfiles/fedora-win64-cross.docker   | 1 -
>   tests/docker/dockerfiles/fedora.docker               | 1 -
>   tests/docker/dockerfiles/opensuse-leap.docker        | 1 -
>   tests/docker/dockerfiles/ubuntu1804.docker           | 1 -
>   tests/docker/dockerfiles/ubuntu2004.docker           | 1 -
>   tests/lcitool/projects/qemu.yml                      | 1 -
>   tests/vm/centos.aarch64                              | 3 +--
>   tests/vm/fedora                                      | 2 +-
>   18 files changed, 6 insertions(+), 20 deletions(-)


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs
  2022-03-29 10:28 [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs Thomas Huth
  2022-03-29 10:39 ` Philippe Mathieu-Daudé
@ 2022-03-30  8:19 ` Daniel P. Berrangé
  2022-03-30  8:47   ` Thomas Huth
  1 sibling, 1 reply; 4+ messages in thread
From: Daniel P. Berrangé @ 2022-03-30  8:19 UTC (permalink / raw)
  To: Thomas Huth
  Cc: Ed Maste, Beraldo Leal, qemu-devel, Wainer dos Santos Moschetta,
	Philippe Mathieu-Daudé,
	Paolo Bonzini, Alex Bennée, Li-Wen Hsu

On Tue, Mar 29, 2022 at 12:28:08PM +0200, Thomas Huth wrote:
> The perl test harness is not necessary anymore since commit 3d2f73ef75
> ("build: use "meson test" as the test harness"). Thus remove it from
> tests/lcitool/projects/qemu.yml, run "make lcitool-refresh" and manually
> clean the remaining docker / vm files that are not managed by lcitool yet.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Note: This triggers a rebuild of the Centos-stream 8 container when
>  pushed to gitlab.com - which is however currently failing due to a
>  completely unrelated problem in the distro. Thus I've marked this as
>  "for-7.1" for now to avoid disturbing up our 7.0 freeze phase.

FYI The centos repo issues appear to be resolved this morning.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs
  2022-03-30  8:19 ` Daniel P. Berrangé
@ 2022-03-30  8:47   ` Thomas Huth
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2022-03-30  8:47 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: Ed Maste, Beraldo Leal, qemu-devel, Wainer dos Santos Moschetta,
	Philippe Mathieu-Daudé,
	Paolo Bonzini, Alex Bennée, Li-Wen Hsu

On 30/03/2022 10.19, Daniel P. Berrangé wrote:
> On Tue, Mar 29, 2022 at 12:28:08PM +0200, Thomas Huth wrote:
>> The perl test harness is not necessary anymore since commit 3d2f73ef75
>> ("build: use "meson test" as the test harness"). Thus remove it from
>> tests/lcitool/projects/qemu.yml, run "make lcitool-refresh" and manually
>> clean the remaining docker / vm files that are not managed by lcitool yet.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   Note: This triggers a rebuild of the Centos-stream 8 container when
>>   pushed to gitlab.com - which is however currently failing due to a
>>   completely unrelated problem in the distro. Thus I've marked this as
>>   "for-7.1" for now to avoid disturbing up our 7.0 freeze phase.
> 
> FYI The centos repo issues appear to be resolved this morning.

Thanks, I've restarted the failed amd64-centos8-container job, and indeed it 
is succeeding now:

  https://gitlab.com/thuth/qemu/-/pipelines/503534214

  Thomas



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-30  8:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 10:28 [PATCH for-7.1] tests: Drop perl-Test-Harness from the CI containers / VMs Thomas Huth
2022-03-29 10:39 ` Philippe Mathieu-Daudé
2022-03-30  8:19 ` Daniel P. Berrangé
2022-03-30  8:47   ` Thomas Huth

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.