mirror of
https://github.com/qemu/qemu.git
synced 2026-04-05 22:00:58 +00:00
tests: Replace ncat with socat in migration test and drop ncat from containers
nmap / ncat has a somewhat problematic license (e.g. saying claiming
that derived work is also considered for software that "is designed
specifically to execute Covered Software and parse the results", e.g.
by executing ncat from your own program, you might already fall into
this category) - so for example in openSUSE 16, you can only find it
in the "non-OSS" repository.
We are currently only using it in the migration functional test, and
that likely does not fall into this "derived work" category yet (since
it is also doing some other stuff), but still, to be safe, we should
move away from using it now.
Unfortunately, switching to one of the other flavors of netcat is
also not a real option (see commit f700abbbeb),
but socat should be a solid replacement here instead.
To avoid that someone else easily uses ncat again, let's also remove
it from our container files now.
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20260316183016.239526-1-thuth@redhat.com>
Message-ID: <20260320155107.2143191-9-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Thomas Huth
Alex Bennée
@@ -101,7 +101,6 @@ packages:
|
||||
- make
|
||||
- mtools
|
||||
- multipath-tools
|
||||
- ncat
|
||||
- nettle-dev
|
||||
- ninja-build
|
||||
- openssh-client
|
||||
|
||||
@@ -102,7 +102,6 @@ packages:
|
||||
- make
|
||||
- mtools
|
||||
- multipath-tools
|
||||
- ncat
|
||||
- nettle-dev
|
||||
- ninja-build
|
||||
- openssh-client
|
||||
|
||||
@@ -100,7 +100,6 @@ packages:
|
||||
- make
|
||||
- mtools
|
||||
- multipath-tools
|
||||
- ncat
|
||||
- nettle-dev
|
||||
- ninja-build
|
||||
- openssh-client
|
||||
|
||||
@@ -76,7 +76,6 @@ RUN apk update && \
|
||||
ndctl-dev \
|
||||
net-tools \
|
||||
nettle-dev \
|
||||
nmap-ncat \
|
||||
numactl-dev \
|
||||
openssh-client \
|
||||
pcre2-dev \
|
||||
|
||||
@@ -87,7 +87,6 @@ RUN dnf --quiet distro-sync -y && \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
ninja-build \
|
||||
nmap-ncat \
|
||||
numactl-devel \
|
||||
openssh-clients \
|
||||
pam-devel \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
locales \
|
||||
make \
|
||||
mtools \
|
||||
ncat \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
pkgconf \
|
||||
|
||||
@@ -109,7 +109,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
make \
|
||||
mtools \
|
||||
multipath-tools \
|
||||
ncat \
|
||||
nettle-dev \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
|
||||
@@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
ninja-build \
|
||||
nmap-ncat \
|
||||
numactl-devel \
|
||||
openssh-clients \
|
||||
pam-devel \
|
||||
|
||||
@@ -42,7 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \
|
||||
make \
|
||||
mtools \
|
||||
ninja-build \
|
||||
nmap-ncat \
|
||||
openssh-clients \
|
||||
python3 \
|
||||
python3-PyYAML \
|
||||
|
||||
@@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
ninja-build \
|
||||
nmap-ncat \
|
||||
numactl-devel \
|
||||
openssh-clients \
|
||||
pam-devel \
|
||||
|
||||
@@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
make \
|
||||
mtools \
|
||||
multipath-tools \
|
||||
ncat \
|
||||
nettle-dev \
|
||||
ninja-build \
|
||||
openssh-client \
|
||||
|
||||
@@ -84,6 +84,6 @@ class MigrationTest(QemuSystemTest):
|
||||
self.skipTest('ncat is not available')
|
||||
with Ports() as ports:
|
||||
free_port = self._get_free_port(ports)
|
||||
dst_uri = 'exec:ncat -l localhost %u' % free_port
|
||||
src_uri = 'exec:ncat localhost %u' % free_port
|
||||
dst_uri = 'exec:socat TCP-LISTEN:%u -' % free_port
|
||||
src_uri = 'exec:socat - TCP:localhost:%u' % free_port
|
||||
self.migrate(dst_uri, src_uri)
|
||||
|
||||
@@ -83,7 +83,6 @@ packages:
|
||||
- meson
|
||||
- mtools
|
||||
- ncursesw
|
||||
- netcat
|
||||
- nettle
|
||||
- ninja
|
||||
- nsis
|
||||
|
||||
Reference in New Issue
Block a user