From d005079ec4ad878a0ebd2b4071b2153a29f3380d Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Fri, 29 Sep 2023 09:22:02 -0400 Subject: [PATCH] ci: fedora: Install virtme-ng and fluster Also install extra packages: - busybox - iproute - qemu-system-x86 These are necessary for virtme to run a script in the virtual machine. Part-of: --- .gitlab-image-tags.yml | 2 +- ci/docker/fedora/prepare.sh | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 23363c867e..389b44c380 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,7 +5,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2023-10-22.1' + FEDORA_TAG: '2023-10-25' INDENT_TAG: '2023-08-24.3' diff --git a/ci/docker/fedora/prepare.sh b/ci/docker/fedora/prepare.sh index 86b9d2c539..a7c32aae48 100644 --- a/ci/docker/fedora/prepare.sh +++ b/ci/docker/fedora/prepare.sh @@ -25,6 +25,7 @@ dnf install -y \ aalib-devel \ aom \ bat \ + busybox \ intel-mediasdk-devel \ libaom \ libaom-devel \ @@ -62,6 +63,7 @@ dnf install -y \ gupnp-igd-devel \ gssdp \ gssdp-devel \ + iproute \ faac-devel \ ffmpeg \ ffmpeg-libs \ @@ -111,6 +113,7 @@ dnf install -y \ opencv-devel \ openjpeg2 \ openjpeg2-devel \ + qemu-system-x86 \ SDL2 \ SDL2-devel \ sbc \ @@ -236,7 +239,7 @@ dnf builddep -y gstreamer1 \ python3-gstreamer1 dnf remove -y meson -x ninja-build -pip3 install meson==1.2.3 hotdoc==0.15 python-gitlab tomli +pip3 install meson==1.2.3 hotdoc==0.15 python-gitlab tomli junitparser # Remove gst-devel packages installed by builddep above dnf remove -y "gstreamer1*devel" @@ -283,6 +286,23 @@ rustup --version cargo --version rustc --version +# Install virtme-ng +git clone https://github.com/arighi/virtme-ng.git +pushd virtme-ng +git fetch --tags +git checkout v1.8 +./setup.py install --prefix=/usr +popd + +# Install fluster +pushd /opt/ +git clone https://github.com/fluendo/fluster.git +pushd fluster +git checkout 303a6edfda1701c8bc351909fb1173a0958810c2 +./fluster.py download +popd +popd + # get gstreamer and make all subprojects available git clone -b ${GIT_BRANCH} ${GIT_URL} /gstreamer git -C /gstreamer submodule update --init --depth=1