aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2022-07-12 10:55:54 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2022-07-12 13:32:07 +0100
commitb024bdedf85df1de179b4c8c3094c020ca76331c (patch)
tree799067245598a7182b928b2f601660844887dd6a
parentc924ff8a33515d6df2175b369da1d49d0f8fd0e0 (diff)
downloadlibvirt-ci-b024bdedf85df1de179b4c8c3094c020ca76331c.zip
libvirt-ci-b024bdedf85df1de179b4c8c3094c020ca76331c.tar.gz
libvirt-ci-b024bdedf85df1de179b4c8c3094c020ca76331c.tar.bz2
projects: add cmocka and json-c to QEMU project
These are used by the vfio-user submodule recently added Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--lcitool/ansible/vars/projects/qemu.yml2
-rw-r--r--tests/data/formatters/out/almalinux-8-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/almalinux-9-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/alpine-314-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/alpine-315-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/alpine-316-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/alpine-edge-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/centos-stream-8-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/centos-stream-9-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/debian-10-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/debian-11-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/debian-sid-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/fedora-35-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/fedora-36-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/fedora-rawhide-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/opensuse-leap-153-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/opensuse-tumbleweed-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/ubuntu-1804-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/ubuntu-2004-all-projects.Dockerfile2
-rw-r--r--tests/data/formatters/out/ubuntu-2204-all-projects.Dockerfile2
20 files changed, 40 insertions, 0 deletions
diff --git a/lcitool/ansible/vars/projects/qemu.yml b/lcitool/ansible/vars/projects/qemu.yml
index f656ef3..425459c 100644
--- a/lcitool/ansible/vars/projects/qemu.yml
+++ b/lcitool/ansible/vars/projects/qemu.yml
@@ -10,6 +10,7 @@ packages:
- capstone
- ccache
- clang
+ - cmocka
- column
- ctags
- cyrus-sasl
@@ -32,6 +33,7 @@ packages:
- gnutls
- gtk3
- hostname
+ - json-c
- libaio
- libasan
- libattr
diff --git a/tests/data/formatters/out/almalinux-8-all-projects.Dockerfile b/tests/data/formatters/out/almalinux-8-all-projects.Dockerfile
index d0c1773..abfdfec 100644
--- a/tests/data/formatters/out/almalinux-8-all-projects.Dockerfile
+++ b/tests/data/formatters/out/almalinux-8-all-projects.Dockerfile
@@ -77,6 +77,7 @@ RUN dnf update -y && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
kmod \
libacl-devel \
@@ -88,6 +89,7 @@ RUN dnf update -y && \
libbpf-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libconfig-devel \
libcurl-devel \
libdrm-devel \
diff --git a/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile b/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile
index 7ea91c1..3f7bba7 100644
--- a/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile
+++ b/tests/data/formatters/out/almalinux-9-all-projects.Dockerfile
@@ -75,6 +75,7 @@ RUN dnf update -y && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
junit \
kmod \
@@ -86,6 +87,7 @@ RUN dnf update -y && \
libblkid-devel \
libbpf-devel \
libcap-ng-devel \
+ libcmocka-devel \
libconfig-devel \
libcurl-devel \
libdrm-devel \
diff --git a/tests/data/formatters/out/alpine-314-all-projects.Dockerfile b/tests/data/formatters/out/alpine-314-all-projects.Dockerfile
index 0395e6f..b643793 100644
--- a/tests/data/formatters/out/alpine-314-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-314-all-projects.Dockerfile
@@ -26,6 +26,7 @@ RUN apk update && \
check \
clang \
clang-dev \
+ cmocka-dev \
ctags \
curl-dev \
cyrus-sasl-dev \
@@ -64,6 +65,7 @@ RUN apk update && \
iptables \
java-jna \
jq \
+ json-c-dev \
json-glib-dev \
junit \
kmod \
diff --git a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
index 05b4b0a..3bcf91c 100644
--- a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile
@@ -26,6 +26,7 @@ RUN apk update && \
check \
clang \
clang-dev \
+ cmocka-dev \
ctags \
curl-dev \
cyrus-sasl-dev \
@@ -64,6 +65,7 @@ RUN apk update && \
iptables \
java-jna \
jq \
+ json-c-dev \
json-glib-dev \
junit \
kmod \
diff --git a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
index cb6180b..d5b43d1 100644
--- a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile
@@ -26,6 +26,7 @@ RUN apk update && \
check \
clang \
clang-dev \
+ cmocka-dev \
ctags \
curl-dev \
cyrus-sasl-dev \
@@ -64,6 +65,7 @@ RUN apk update && \
iptables \
java-jna \
jq \
+ json-c-dev \
json-glib-dev \
junit \
kmod \
diff --git a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
index 4801e81..9c7cb7e 100644
--- a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
+++ b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile
@@ -26,6 +26,7 @@ RUN apk update && \
check \
clang \
clang-dev \
+ cmocka-dev \
ctags \
curl-dev \
cyrus-sasl-dev \
@@ -64,6 +65,7 @@ RUN apk update && \
iptables \
java-jna \
jq \
+ json-c-dev \
json-glib-dev \
junit \
kmod \
diff --git a/tests/data/formatters/out/centos-stream-8-all-projects.Dockerfile b/tests/data/formatters/out/centos-stream-8-all-projects.Dockerfile
index 7d0a0f6..c0fe9e9 100644
--- a/tests/data/formatters/out/centos-stream-8-all-projects.Dockerfile
+++ b/tests/data/formatters/out/centos-stream-8-all-projects.Dockerfile
@@ -78,6 +78,7 @@ RUN dnf distro-sync -y && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
kmod \
libacl-devel \
@@ -89,6 +90,7 @@ RUN dnf distro-sync -y && \
libbpf-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libconfig-devel \
libcurl-devel \
libdrm-devel \
diff --git a/tests/data/formatters/out/centos-stream-9-all-projects.Dockerfile b/tests/data/formatters/out/centos-stream-9-all-projects.Dockerfile
index a926ca7..e9b60b1 100644
--- a/tests/data/formatters/out/centos-stream-9-all-projects.Dockerfile
+++ b/tests/data/formatters/out/centos-stream-9-all-projects.Dockerfile
@@ -76,6 +76,7 @@ RUN dnf distro-sync -y && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
junit \
kmod \
@@ -87,6 +88,7 @@ RUN dnf distro-sync -y && \
libblkid-devel \
libbpf-devel \
libcap-ng-devel \
+ libcmocka-devel \
libconfig-devel \
libcurl-devel \
libdrm-devel \
diff --git a/tests/data/formatters/out/debian-10-all-projects.Dockerfile b/tests/data/formatters/out/debian-10-all-projects.Dockerfile
index 5c5cd66..e58e00a 100644
--- a/tests/data/formatters/out/debian-10-all-projects.Dockerfile
+++ b/tests/data/formatters/out/debian-10-all-projects.Dockerfile
@@ -75,6 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -111,6 +112,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg62-turbo-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \
diff --git a/tests/data/formatters/out/debian-11-all-projects.Dockerfile b/tests/data/formatters/out/debian-11-all-projects.Dockerfile
index 9b97d2c..36f0df7 100644
--- a/tests/data/formatters/out/debian-11-all-projects.Dockerfile
+++ b/tests/data/formatters/out/debian-11-all-projects.Dockerfile
@@ -75,6 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -111,6 +112,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg62-turbo-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \
diff --git a/tests/data/formatters/out/debian-sid-all-projects.Dockerfile b/tests/data/formatters/out/debian-sid-all-projects.Dockerfile
index ec16504..c2ce360 100644
--- a/tests/data/formatters/out/debian-sid-all-projects.Dockerfile
+++ b/tests/data/formatters/out/debian-sid-all-projects.Dockerfile
@@ -75,6 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -111,6 +112,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg62-turbo-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \
diff --git a/tests/data/formatters/out/fedora-35-all-projects.Dockerfile b/tests/data/formatters/out/fedora-35-all-projects.Dockerfile
index 0a7e228..373ab79 100644
--- a/tests/data/formatters/out/fedora-35-all-projects.Dockerfile
+++ b/tests/data/formatters/out/fedora-35-all-projects.Dockerfile
@@ -90,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
junit \
kmod \
@@ -102,6 +103,7 @@ exec "$@"' > /usr/bin/nosync && \
libbpf-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libcmpiutil-devel \
libconfig-devel \
libcurl-devel \
diff --git a/tests/data/formatters/out/fedora-36-all-projects.Dockerfile b/tests/data/formatters/out/fedora-36-all-projects.Dockerfile
index 6dc0a32..dd6075e 100644
--- a/tests/data/formatters/out/fedora-36-all-projects.Dockerfile
+++ b/tests/data/formatters/out/fedora-36-all-projects.Dockerfile
@@ -90,6 +90,7 @@ exec "$@"' > /usr/bin/nosync && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
junit \
kmod \
@@ -102,6 +103,7 @@ exec "$@"' > /usr/bin/nosync && \
libbpf-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libcmpiutil-devel \
libconfig-devel \
libcurl-devel \
diff --git a/tests/data/formatters/out/fedora-rawhide-all-projects.Dockerfile b/tests/data/formatters/out/fedora-rawhide-all-projects.Dockerfile
index bf46381..3b8fa16 100644
--- a/tests/data/formatters/out/fedora-rawhide-all-projects.Dockerfile
+++ b/tests/data/formatters/out/fedora-rawhide-all-projects.Dockerfile
@@ -91,6 +91,7 @@ exec "$@"' > /usr/bin/nosync && \
jemalloc-devel \
jna \
jq \
+ json-c-devel \
json-glib-devel \
junit \
kmod \
@@ -103,6 +104,7 @@ exec "$@"' > /usr/bin/nosync && \
libbpf-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libcmpiutil-devel \
libconfig-devel \
libcurl-devel \
diff --git a/tests/data/formatters/out/opensuse-leap-153-all-projects.Dockerfile b/tests/data/formatters/out/opensuse-leap-153-all-projects.Dockerfile
index b787282..8b8d4a6 100644
--- a/tests/data/formatters/out/opensuse-leap-153-all-projects.Dockerfile
+++ b/tests/data/formatters/out/opensuse-leap-153-all-projects.Dockerfile
@@ -85,6 +85,7 @@ RUN zypper update -y && \
libbz2-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libcmpiutil-devel \
libconfig-devel \
libcurl-devel \
@@ -98,6 +99,7 @@ RUN zypper update -y && \
libgovirt-devel \
libiscsi-devel \
libjpeg8-devel \
+ libjson-c-devel \
libndctl-devel \
libnettle-devel \
libnfs-devel \
diff --git a/tests/data/formatters/out/opensuse-tumbleweed-all-projects.Dockerfile b/tests/data/formatters/out/opensuse-tumbleweed-all-projects.Dockerfile
index 02e686b..dceeb81 100644
--- a/tests/data/formatters/out/opensuse-tumbleweed-all-projects.Dockerfile
+++ b/tests/data/formatters/out/opensuse-tumbleweed-all-projects.Dockerfile
@@ -85,6 +85,7 @@ RUN zypper dist-upgrade -y && \
libbz2-devel \
libcacard-devel \
libcap-ng-devel \
+ libcmocka-devel \
libcmpiutil-devel \
libconfig-devel \
libcurl-devel \
@@ -98,6 +99,7 @@ RUN zypper dist-upgrade -y && \
libgovirt-devel \
libiscsi-devel \
libjpeg8-devel \
+ libjson-c-devel \
libndctl-devel \
libnettle-devel \
libnfs-devel \
diff --git a/tests/data/formatters/out/ubuntu-1804-all-projects.Dockerfile b/tests/data/formatters/out/ubuntu-1804-all-projects.Dockerfile
index 80d7a4d..94b26ed 100644
--- a/tests/data/formatters/out/ubuntu-1804-all-projects.Dockerfile
+++ b/tests/data/formatters/out/ubuntu-1804-all-projects.Dockerfile
@@ -74,6 +74,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -107,6 +108,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg-turbo8-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \
diff --git a/tests/data/formatters/out/ubuntu-2004-all-projects.Dockerfile b/tests/data/formatters/out/ubuntu-2004-all-projects.Dockerfile
index 4359d05..fd81122 100644
--- a/tests/data/formatters/out/ubuntu-2004-all-projects.Dockerfile
+++ b/tests/data/formatters/out/ubuntu-2004-all-projects.Dockerfile
@@ -74,6 +74,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -109,6 +110,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg-turbo8-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \
diff --git a/tests/data/formatters/out/ubuntu-2204-all-projects.Dockerfile b/tests/data/formatters/out/ubuntu-2204-all-projects.Dockerfile
index ca1bfd0..80ddd6a 100644
--- a/tests/data/formatters/out/ubuntu-2204-all-projects.Dockerfile
+++ b/tests/data/formatters/out/ubuntu-2204-all-projects.Dockerfile
@@ -75,6 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcap-ng-dev \
libcapstone-dev \
libclang-dev \
+ libcmocka-dev \
libconfig-dev \
libcpan-changes-perl \
libcurl4-gnutls-dev \
@@ -110,6 +111,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libjemalloc-dev \
libjna-java \
libjpeg-turbo8-dev \
+ libjson-c-dev \
libjson-glib-dev \
liblttng-ust-dev \
liblzma-dev \