From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 6/9] gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs
Date: Fri, 12 Mar 2021 18:23:53 +0100 [thread overview]
Message-ID: <20210312172356.968219-7-thuth@redhat.com> (raw)
In-Reply-To: <20210312172356.968219-1-thuth@redhat.com>
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>
---
.gitlab-ci.yml | 45 ++++-----------------------------------------
1 file changed, 4 insertions(+), 41 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45303cafdd..0ada3dbb90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -585,7 +585,7 @@ build-coroutine-sigaltstack:
#
# These jobs test old gcrypt and nettle from RHEL7
# which had some API differences.
-build-crypto-old-nettle:
+crypto-old-nettle:
<<: *native_build_job_definition
needs:
job: amd64-centos7-container
@@ -593,22 +593,9 @@ build-crypto-old-nettle:
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:
+crypto-old-gcrypt:
<<: *native_build_job_definition
needs:
job: amd64-centos7-container
@@ -616,22 +603,9 @@ build-crypto-old-gcrypt:
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:
+crypto-only-gnutls:
<<: *native_build_job_definition
needs:
job: amd64-centos7-container
@@ -639,20 +613,9 @@ build-crypto-only-gnutls:
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
+
# We don't need to exercise every backend with every front-end
build-trace-multi-user:
<<: *native_build_job_definition
--
2.27.0
next prev parent reply other threads:[~2021-03-12 18:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 17:23 [PULL 0/9] Gitlab-CI, tests and docs Thomas Huth
2021-03-12 17:23 ` [PULL 1/9] tests: Move unit tests into a separate directory Thomas Huth
2021-03-12 17:23 ` [PULL 2/9] tests: Move benchmarks into a separate folder Thomas Huth
2021-03-12 17:23 ` [PULL 3/9] gitlab-ci.yml: Move build-tools-and-docs-debian to a better place Thomas Huth
2021-03-12 17:23 ` [PULL 4/9] gitlab-ci.yml: Add some missing dependencies to the jobs Thomas Huth
2021-03-12 17:23 ` [PULL 5/9] gitlab-ci.yml: Merge one of the coroutine jobs with the tcg-disabled job Thomas Huth
2021-03-12 17:23 ` Thomas Huth [this message]
2021-03-12 17:23 ` [PULL 7/9] tests: remove "make check-speed" in favor of "make bench" Thomas Huth
2021-03-12 17:23 ` [PULL 8/9] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section Thomas Huth
2021-03-12 17:23 ` [PULL 9/9] README: Add Documentation blurb Thomas Huth
2021-03-14 17:47 ` [PULL 0/9] Gitlab-CI, tests and docs Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312172356.968219-7-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).