ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs 

Both, the build-crypto-old and the check-crypto-old jobs finish reasonably
fast, and the build artifacts are only used for the single corresponding
check jobs, so there is no reason for doing the check step in a separate
job here. Thus let's stop wasting artifacts space and job scheduler over-
head by simply merging the test step into the build jobs.

Message-Id: <20210311142211.1547864-5-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2021-03-11 15:22:11 +01:00
parent 7da153e818
commit 342409564c
1 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.gitlab-ci.yml
View File

@ -585,7 +585,7 @@ build-coroutine-sigaltstack:
# #
# These jobs test old gcrypt and nettle from RHEL7 # These jobs test old gcrypt and nettle from RHEL7
# which had some API differences. # which had some API differences.
build-crypto-old-nettle: crypto-old-nettle:
<<: *native_build_job_definition <<: *native_build_job_definition
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
@ -593,22 +593,9 @@ build-crypto-old-nettle:
IMAGE: centos7 IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user TARGETS: x86_64-softmmu x86_64-linux-user
CONFIGURE_ARGS: --disable-gcrypt --enable-nettle 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 MAKE_CHECK_ARGS: check
crypto-old-gcrypt:
build-crypto-old-gcrypt:
<<: *native_build_job_definition <<: *native_build_job_definition
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
@ -616,22 +603,9 @@ build-crypto-old-gcrypt:
IMAGE: centos7 IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user TARGETS: x86_64-softmmu x86_64-linux-user
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt 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 MAKE_CHECK_ARGS: check
crypto-only-gnutls:
build-crypto-only-gnutls:
<<: *native_build_job_definition <<: *native_build_job_definition
needs: needs:
job: amd64-centos7-container job: amd64-centos7-container
@ -639,20 +613,9 @@ build-crypto-only-gnutls:
IMAGE: centos7 IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user TARGETS: x86_64-softmmu x86_64-linux-user
CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls 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 MAKE_CHECK_ARGS: check
# We don't need to exercise every backend with every front-end # We don't need to exercise every backend with every front-end
build-trace-multi-user: build-trace-multi-user:
<<: *native_build_job_definition <<: *native_build_job_definition