[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/14] gitlab: expand test coverage for crypto builds
From: |
Thomas Huth |
Subject: |
[PULL 12/14] gitlab: expand test coverage for crypto builds |
Date: |
Mon, 7 Sep 2020 14:11:25 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
Most jobs test the latest nettle library. This adds explicit coverage
for latest gcrypt using Fedora, and old gcrypt and nettle using
CentOS-7. The latter does a minimal tools-only build, as we only need to
validate that the crypto code builds and unit tests pass. Finally a job
disabling both nettle and gcrypt is provided to validate that gnutls
still works.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200901133050.381844-3-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 68 +++++++++++++++++++++++++
tests/docker/dockerfiles/centos7.docker | 2 +
tests/docker/dockerfiles/centos8.docker | 1 +
3 files changed, 71 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d677e00933..72e8604579 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,6 +133,7 @@ build-system-fedora:
<<: *native_build_job_definition
variables:
IMAGE: fedora
+ CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-softmmu
xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
MAKE_CHECK_ARGS: check-build
@@ -164,6 +165,7 @@ build-system-centos:
<<: *native_build_job_definition
variables:
IMAGE: centos8
+ CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
TARGETS: ppc64-softmmu lm32-softmmu or1k-softmmu s390x-softmmu
x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
MAKE_CHECK_ARGS: check-build
@@ -290,3 +292,69 @@ build-tci:
done
- QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test
- QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
+
+# Most jobs test latest gcrypt or nettle builds
+#
+# These jobs test old gcrypt and nettle from RHEL7
+# which had some API differences.
+build-crypto-old-nettle:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: centos7
+ TARGETS: x86_64-softmmu x86_64-linux-user
+ CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ paths:
+ - build
+
+check-crypto-old-nettle:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-crypto-old-nettle
+ artifacts: true
+ variables:
+ IMAGE: centos7
+ MAKE_CHECK_ARGS: check
+
+
+build-crypto-old-gcrypt:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: centos7
+ TARGETS: x86_64-softmmu x86_64-linux-user
+ CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ paths:
+ - build
+
+check-crypto-old-gcrypt:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-crypto-old-gcrypt
+ artifacts: true
+ variables:
+ IMAGE: centos7
+ MAKE_CHECK_ARGS: check
+
+
+build-crypto-only-gnutls:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: centos7
+ TARGETS: x86_64-softmmu x86_64-linux-user
+ CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ paths:
+ - build
+
+check-crypto-only-gnutls:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-crypto-only-gnutls
+ artifacts: true
+ variables:
+ IMAGE: centos7
+ MAKE_CHECK_ARGS: check
diff --git a/tests/docker/dockerfiles/centos7.docker
b/tests/docker/dockerfiles/centos7.docker
index e197acdc3c..46277773bf 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -15,9 +15,11 @@ ENV PACKAGES \
gettext \
git \
glib2-devel \
+ gnutls-devel \
libaio-devel \
libepoxy-devel \
libfdt-devel \
+ libgcrypt-devel \
librdmacm-devel \
libzstd-devel \
lzo-devel \
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index 9852c5b9ee..f435616d6a 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -13,6 +13,7 @@ ENV PACKAGES \
glib2-devel \
libaio-devel \
libepoxy-devel \
+ libgcrypt-devel \
lzo-devel \
make \
mesa-libEGL-devel \
--
2.18.2
- [PULL 01/14] tests/docker: add python3-setuptools the docker images, (continued)
- [PULL 01/14] tests/docker: add python3-setuptools the docker images, Thomas Huth, 2020/09/07
- [PULL 02/14] tests: handling signal on win32 properly, Thomas Huth, 2020/09/07
- [PULL 03/14] tests: fixes test-vmstate.c compile error on msys2, Thomas Huth, 2020/09/07
- [PULL 05/14] tests/Makefile: test-image-locking needs CONFIG_POSIX, Thomas Huth, 2020/09/07
- [PULL 04/14] tests: Fixes building test-util-filemonitor.c on msys2/mingw, Thomas Huth, 2020/09/07
- [PULL 06/14] dockerfiles/debian-win64-cross: Download WHPX MinGW headers, Thomas Huth, 2020/09/07
- [PULL 07/14] configure: Allow automatic WHPX detection, Thomas Huth, 2020/09/07
- [PULL 08/14] stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub, Thomas Huth, 2020/09/07
- [PULL 10/14] gitlab-ci: Add cross-compiling build tests, Thomas Huth, 2020/09/07
- [PULL 11/14] crypto: fix build with gcrypt enabled, Thomas Huth, 2020/09/07
- [PULL 12/14] gitlab: expand test coverage for crypto builds,
Thomas Huth <=
- [PULL 13/14] tests/qtest: do not list ahci-test twice, Thomas Huth, 2020/09/07
- [PULL 14/14] target/microblaze: Collected fixes for env->iflags, Thomas Huth, 2020/09/07
- [PULL 09/14] stubs: Move qemu_fd_register stub to util/main-loop.c, Thomas Huth, 2020/09/07
- Re: [PULL 00/14] Gitlab-CI improvements and related fixes, Yonggang Luo, 2020/09/07
- Re: [PULL 00/14] Gitlab-CI improvements and related fixes, Peter Maydell, 2020/09/07