ci: fix running of vnc-display-test
cover ci: fix running of vnc-display-test
The vnc-display-test is skipped in CI due to missing gvnc RPMs, fix that.
Daniel P. Berrangé (2):
ci: add gtk-vnc to the deps
ci: refresh package lists with lcitool
.gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-14.vars | 2 +- scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 + scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 + tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-i686-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/debian.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/ubuntu2204.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + tests/vm/generated/freebsd.json | 1 + 22 files changed, 22 insertions(+), 3 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/2 ci: add gtk-vnc to the deps
The gtk-vnc package is used by the vnc-display-test qtest program. Technically only gvnc is needed, but since we already pull in the gtk3 dep, it is harmless to depend on gtk-vnc.
--- tests/lcitool/projects/qemu.yml | 1 + 1 file changed, 1 insertion(+)
tests/lcitool/projects/qemu.yml +1 -0
@@ -32,6 +32,7 @@ packages: - glusterfs - gnutls - gtk3 + - gtk-vnc - hostname - json-c - libaio
Signature · 1 line
2.45.2
Re: [PATCH 1/2] ci: add gtk-vnc to the deps
Quoted 15 lines · Daniel P. Berrangé
The gtk-vnc package is used by the vnc-display-test qtest program. Technically only gvnc is needed, but since we already pull in the gtk3 dep, it is harmless to depend on gtk-vnc.
Signed-off-by Daniel P. Berrangé <[email protected]>--- tests/lcitool/projects/qemu.yml | 1 + 1 file changed, 1 insertion(+)tests/lcitool/projects/qemu.yml +0
-0
tests/lcitool/projects/qemu.yml packages: · line 38
Quoted 7 lines
tests/lcitool/projects/qemu.yml +1
-0@@ -32,6 +32,7 @@ packages: - glusterfs - gnutls - gtk3 + - gtk-vnc - hostname - json-c - libaio
IIRC Alex has a patch in his queue already to refresh the docker images, maybe he could include this change there, too...?
Re: [PATCH 1/2] ci: add gtk-vnc to the deps
Quoted 26 lines · Thomas Huth
Quoted 15 lines · Daniel P. Berrangé
The gtk-vnc package is used by the vnc-display-test qtest program. Technically only gvnc is needed, but since we already pull in the gtk3 dep, it is harmless to depend on gtk-vnc.
Signed-off-by Daniel P. Berrangé <[email protected]>--- tests/lcitool/projects/qemu.yml | 1 + 1 file changed, 1 insertion(+)tests/lcitool/projects/qemu.yml +0
-0tests/lcitool/projects/qemu.yml packages: · line 38
Quoted 7 lines
tests/lcitool/projects/qemu.yml +1
-0@@ -32,6 +32,7 @@ packages: - glusterfs - gnutls - gtk3 + - gtk-vnc - hostname - json-c - libaioReviewed-by Thomas Huth <[email protected]>
Quoted 2 lines
IIRC Alex has a patch in his queue already to refresh the docker images, maybe he could include this change there, too...?
Yep, I included patch 2 just for completeness, assuming Alex would just pick patch 1, and then re-generate.
With regards,
Daniel
Signature · 3 lines
|: 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 :|
PATCH 2/2 ci: refresh package lists with lcitool
In reply to Daniel P. BerrangéRefresh with the newly added gtk-vnc package
--- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-14.vars | 2 +- scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 + scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 + tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-i686-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/debian.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/ubuntu2204.docker | 1 + tests/vm/generated/freebsd.json | 1 + 21 files changed, 21 insertions(+), 3 deletions(-)
.gitlab-ci.d/cirrus/freebsd-13.vars +1 -1
@@ -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 bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-tomli py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-tomli py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3'
.gitlab-ci.d/cirrus/macos-13.vars +1 -1
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' PYTHON='/opt/homebrew/bin/python3'
.gitlab-ci.d/cirrus/macos-14.vars +1 -1
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' PYTHON='/opt/homebrew/bin/python3'
scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml +1 -0
@@ -49,6 +49,7 @@ packages: - libglusterfs-dev - libgnutls28-dev - libgtk-3-dev + - libgtk-vnc-2.0-dev - libibverbs-dev - libiscsi-dev - libjemalloc-dev
scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml +1 -0
@@ -49,6 +49,7 @@ packages: - libglusterfs-dev - libgnutls28-dev - libgtk-3-dev + - libgtk-vnc-2.0-dev - libibverbs-dev - libiscsi-dev - libjemalloc-dev
tests/docker/dockerfiles/alpine.docker +1 -0
@@ -40,6 +40,7 @@ RUN apk update && \ glib-static \ gnutls-dev \ gtk+3.0-dev \ + gtk-vnc-dev \ json-c-dev \ libaio-dev \ libbpf-dev \
tests/docker/dockerfiles/debian-amd64-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-arm64-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-armel-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-armhf-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-i686-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-mips64el-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-mipsel-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-ppc64el-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian-s390x-cross.docker +1 -0
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libglib2.0-dev \ + libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ libspice-protocol-dev \
tests/docker/dockerfiles/debian.docker +1 -0
@@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libgtk-vnc-2.0-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \
tests/docker/dockerfiles/fedora-win64-cross.docker +1 -0
@@ -34,6 +34,7 @@ exec "$@"\n' > /usr/bin/nosync && \ git \ glib2-devel \ glibc-langpack-en \ + gtk-vnc2-devel \ hostname \ llvm \ make \
tests/docker/dockerfiles/fedora.docker +1 -0
@@ -50,6 +50,7 @@ exec "$@"\n' > /usr/bin/nosync && \ glibc-static \ glusterfs-api-devel \ gnutls-devel \ + gtk-vnc2-devel \ gtk3-devel \ hostname \ jemalloc-devel \
tests/docker/dockerfiles/opensuse-leap.docker +1 -0
@@ -33,6 +33,7 @@ RUN zypper update -y && \ glibc-locale \ glibc-static \ glusterfs-devel \ + gtk-vnc-devel \ gtk3-devel \ hostname \ jemalloc-devel \
tests/docker/dockerfiles/ubuntu2204.docker +1 -0
@@ -55,6 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libgtk-vnc-2.0-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \
tests/vm/generated/freebsd.json +1 -0
@@ -29,6 +29,7 @@ "gmake", "gnutls", "gsed", + "gtk-vnc", "gtk3", "json-c", "libepoxy",
Signature · 1 line
2.45.2