Browse Source

tests: Drop perl-Test-Harness from the CI containers / VMs

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.

Message-Id: <20220329102808.423681-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Thomas Huth 3 years ago
parent
commit
b0dd0a3d74

+ 1 - 1
.gitlab-ci.d/cirrus/freebsd-12.vars

@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
 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=''
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
 PYTHON='/usr/local/bin/python3'

+ 1 - 1
.gitlab-ci.d/cirrus/freebsd-13.vars

@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
 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=''
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
 PYTHON='/usr/local/bin/python3'

+ 2 - 2
.gitlab-ci.d/cirrus/macos-11.vars

@@ -5,12 +5,12 @@
 # https://gitlab.com/libvirt/libvirt-ci
 # https://gitlab.com/libvirt/libvirt-ci
 
 
 CCACHE='/usr/local/bin/ccache'
 CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS='Test::Harness'
+CPAN_PKGS=''
 CROSS_PKGS=''
 CROSS_PKGS=''
 MAKE='/usr/local/bin/gmake'
 MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='brew'
 PACKAGING_COMMAND='brew'
 PIP3='/usr/local/bin/pip3'
 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'
 PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
 PYTHON='/usr/local/bin/python3'
 PYTHON='/usr/local/bin/python3'

+ 0 - 1
tests/docker/dockerfiles/alpine.docker

@@ -73,7 +73,6 @@ RUN apk update && \
         openssh-client \
         openssh-client \
         pcre-dev \
         pcre-dev \
         perl \
         perl \
-        perl-test-harness \
         pixman-dev \
         pixman-dev \
         pkgconf \
         pkgconf \
         pulseaudio-dev \
         pulseaudio-dev \

+ 0 - 1
tests/docker/dockerfiles/centos8.docker

@@ -87,7 +87,6 @@ RUN dnf update -y && \
         pam-devel \
         pam-devel \
         pcre-static \
         pcre-static \
         perl \
         perl \
-        perl-Test-Harness \
         pixman-devel \
         pixman-devel \
         pkgconfig \
         pkgconfig \
         pulseaudio-libs-devel \
         pulseaudio-libs-devel \

+ 0 - 1
tests/docker/dockerfiles/debian-arm64-cross.docker

@@ -29,7 +29,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             hostname \
             hostname \
             libpcre2-dev \
             libpcre2-dev \
             libspice-protocol-dev \
             libspice-protocol-dev \
-            libtest-harness-perl \
             llvm \
             llvm \
             locales \
             locales \
             make \
             make \

+ 0 - 1
tests/docker/dockerfiles/debian-s390x-cross.docker

@@ -29,7 +29,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             hostname \
             hostname \
             libpcre2-dev \
             libpcre2-dev \
             libspice-protocol-dev \
             libspice-protocol-dev \
-            libtest-harness-perl \
             llvm \
             llvm \
             locales \
             locales \
             make \
             make \

+ 0 - 1
tests/docker/dockerfiles/debian-tricore-cross.docker

@@ -25,7 +25,6 @@ RUN apt update && \
        git \
        git \
        libglib2.0-dev \
        libglib2.0-dev \
        libpixman-1-dev \
        libpixman-1-dev \
-       libtest-harness-perl \
        locales \
        locales \
        make \
        make \
        ninja-build \
        ninja-build \

+ 0 - 1
tests/docker/dockerfiles/fedora-i386-cross.docker

@@ -20,7 +20,6 @@ ENV PACKAGES \
     gnutls-devel.i686 \
     gnutls-devel.i686 \
     nettle-devel.i686 \
     nettle-devel.i686 \
     pcre-devel.i686 \
     pcre-devel.i686 \
-    perl-Test-Harness \
     pixman-devel.i686 \
     pixman-devel.i686 \
     sysprof-capture-devel.i686 \
     sysprof-capture-devel.i686 \
     zlib-devel.i686
     zlib-devel.i686

+ 0 - 1
tests/docker/dockerfiles/fedora-win32-cross.docker

@@ -31,7 +31,6 @@ ENV PACKAGES \
     mingw32-SDL2 \
     mingw32-SDL2 \
     msitools \
     msitools \
     perl \
     perl \
-    perl-Test-Harness \
     python3 \
     python3 \
     python3-PyYAML \
     python3-PyYAML \
     tar \
     tar \

+ 0 - 1
tests/docker/dockerfiles/fedora-win64-cross.docker

@@ -28,7 +28,6 @@ ENV PACKAGES \
     mingw64-pkg-config \
     mingw64-pkg-config \
     msitools \
     msitools \
     perl \
     perl \
-    perl-Test-Harness \
     python3 \
     python3 \
     python3-PyYAML \
     python3-PyYAML \
     tar \
     tar \

+ 0 - 1
tests/docker/dockerfiles/fedora.docker

@@ -94,7 +94,6 @@ exec "$@"' > /usr/bin/nosync && \
         openssh-clients \
         openssh-clients \
         pam-devel \
         pam-devel \
         pcre-static \
         pcre-static \
-        perl-Test-Harness \
         perl-base \
         perl-base \
         pixman-devel \
         pixman-devel \
         pkgconfig \
         pkgconfig \

+ 0 - 1
tests/docker/dockerfiles/opensuse-leap.docker

@@ -83,7 +83,6 @@ RUN zypper update -y && \
            openssh \
            openssh \
            pam-devel \
            pam-devel \
            pcre-devel-static \
            pcre-devel-static \
-           perl-Test-Harness \
            perl-base \
            perl-base \
            pkgconfig \
            pkgconfig \
            python3-Pillow \
            python3-Pillow \

+ 0 - 1
tests/docker/dockerfiles/ubuntu1804.docker

@@ -81,7 +81,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libssh-dev \
             libsystemd-dev \
             libsystemd-dev \
             libtasn1-6-dev \
             libtasn1-6-dev \
-            libtest-harness-perl \
             libubsan1 \
             libubsan1 \
             libudev-dev \
             libudev-dev \
             libusb-1.0-0-dev \
             libusb-1.0-0-dev \

+ 0 - 1
tests/docker/dockerfiles/ubuntu2004.docker

@@ -83,7 +83,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libssh-dev \
             libsystemd-dev \
             libsystemd-dev \
             libtasn1-6-dev \
             libtasn1-6-dev \
-            libtest-harness-perl \
             libubsan1 \
             libubsan1 \
             libudev-dev \
             libudev-dev \
             libusb-1.0-0-dev \
             libusb-1.0-0-dev \

+ 0 - 1
tests/lcitool/projects/qemu.yml

@@ -79,7 +79,6 @@ packages:
  - pam
  - pam
  - pcre-static
  - pcre-static
  - perl
  - perl
- - perl-Test-Harness
  - pixman
  - pixman
  - pkg-config
  - pkg-config
  - pulseaudio
  - pulseaudio

+ 1 - 2
tests/vm/centos.aarch64

@@ -24,8 +24,7 @@ DEFAULT_CONFIG = {
     'cpu'          : "max",
     'cpu'          : "max",
     'machine'      : "virt,gic-version=max",
     'machine'      : "virt,gic-version=max",
     'install_cmds' : "yum install -y make ninja-build git python3 gcc gcc-c++ flex bison, "\
     '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, "\
         "alternatives --set python /usr/bin/python3, "\
         "sudo dnf config-manager "\
         "sudo dnf config-manager "\
         "--add-repo=https://download.docker.com/linux/centos/docker-ce.repo,"\
         "--add-repo=https://download.docker.com/linux/centos/docker-ce.repo,"\

+ 1 - 1
tests/vm/fedora

@@ -35,7 +35,7 @@ class FedoraVM(basevm.BaseVM):
         'gcc', 'binutils', 'make', 'ninja-build',
         'gcc', 'binutils', 'make', 'ninja-build',
 
 
         # perl
         # perl
-        'perl-Test-Harness',
+        'perl',
 
 
         # libs: usb
         # libs: usb
         '"pkgconfig(libusb-1.0)"',
         '"pkgconfig(libusb-1.0)"',