aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.d
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.d')
-rw-r--r--.gitlab-ci.d/buildtest.yml35
-rw-r--r--.gitlab-ci.d/containers.yml5
2 files changed, 0 insertions, 40 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 807040c1c7..b72c57e4df 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -626,41 +626,6 @@ build-coroutine-sigaltstack:
--enable-trace-backends=ftrace
MAKE_CHECK_ARGS: check-unit
-# Most jobs test latest gcrypt or nettle builds
-#
-# These jobs test old gcrypt and nettle from RHEL7
-# which had some API differences.
-crypto-old-nettle:
- extends: .native_build_job_template
- needs:
- job: amd64-centos7-container
- variables:
- IMAGE: centos7
- TARGETS: x86_64-softmmu x86_64-linux-user
- CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
- MAKE_CHECK_ARGS: check
-
-crypto-old-gcrypt:
- extends: .native_build_job_template
- needs:
- job: amd64-centos7-container
- variables:
- IMAGE: centos7
- TARGETS: x86_64-softmmu x86_64-linux-user
- CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
- MAKE_CHECK_ARGS: check
-
-crypto-only-gnutls:
- extends: .native_build_job_template
- needs:
- job: amd64-centos7-container
- variables:
- IMAGE: centos7
- TARGETS: x86_64-softmmu x86_64-linux-user
- CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls
- MAKE_CHECK_ARGS: check
-
-
# Check our reduced build configurations
build-without-default-devices:
extends: .native_build_job_template
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 1ca455f8e1..cd06d3f5f4 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -7,11 +7,6 @@ amd64-alpine-container:
variables:
NAME: alpine
-amd64-centos7-container:
- extends: .container_job_template
- variables:
- NAME: centos7
-
amd64-debian11-container:
extends: .container_job_template
variables: