From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>
Subject: [PULL 4/7] GitLab CI: avoid calling before_scripts on unintended jobs
Date: Thu, 28 May 2020 12:10:36 +0200 [thread overview]
Message-ID: <20200528101039.24600-5-thuth@redhat.com> (raw)
In-Reply-To: <20200528101039.24600-1-thuth@redhat.com>
From: Cleber Rosa <crosa@redhat.com>
At this point it seems that all jobs depend on those steps, with
maybe the EDK2 jobs as exceptions.
The jobs that will be added later will not want those scripts to be
run, so let's move these steps to the appropriate jobs, while
still trying to avoid repetition.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200525131823.715-4-thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
[thuth: Rebased to current master branch, use separate template]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 994774250f..bc6aee6aba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,13 @@ include:
- local: '/.gitlab-ci-edk2.yml'
- local: '/.gitlab-ci-opensbi.yml'
-before_script:
- - apt-get update -qq
- - apt-get install -y -qq libglib2.0-dev libpixman-1-dev genisoimage
+.update_apt_template: &before_script_apt
+ before_script:
+ - apt-get update -qq
+ - apt-get install -y -qq libglib2.0-dev libpixman-1-dev genisoimage
build-system1:
+ <<: *before_script_apt
script:
- apt-get install -y -qq libgtk-3-dev libvte-dev nettle-dev libcacard-dev
libusb-dev libvde-dev libspice-protocol-dev libgl1-mesa-dev libvdeplug-dev
@@ -19,6 +21,7 @@ build-system1:
- make -j2 check
build-system2:
+ <<: *before_script_apt
script:
- apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev
libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev
@@ -32,6 +35,7 @@ build-system2:
- make -j2 check
build-disabled:
+ <<: *before_script_apt
script:
- mkdir build
- cd build
@@ -46,6 +50,7 @@ build-disabled:
- make -j2 check-qtest SPEED=slow
build-tcg-disabled:
+ <<: *before_script_apt
script:
- apt-get install -y -qq clang libgtk-3-dev libusb-dev
- mkdir build
@@ -64,6 +69,7 @@ build-tcg-disabled:
260 261 262 263 264 270 272 273 277 279
build-user:
+ <<: *before_script_apt
script:
- mkdir build
- cd build
@@ -73,6 +79,7 @@ build-user:
- make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
build-clang:
+ <<: *before_script_apt
script:
- apt-get install -y -qq clang libsdl2-dev libattr1-dev libcap-ng-dev
xfslibs-dev libiscsi-dev libnfs-dev libseccomp-dev gnutls-dev librbd-dev
@@ -85,6 +92,7 @@ build-clang:
- make -j2 check
build-tci:
+ <<: *before_script_apt
script:
- TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64"
- mkdir build
--
2.18.1
next prev parent reply other threads:[~2020-05-28 10:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 10:10 [PULL 0/7] Gitlab CI fixes and improvements Thomas Huth
2020-05-28 10:10 ` [PULL 1/7] linux-user: limit check to HOST_LONG_BITS < TARGET_ABI_BITS Thomas Huth
2020-05-28 10:10 ` [PULL 2/7] MAINTAINERS: Add Philippe, Alex and Wainer to the Gitlab-CI section Thomas Huth
2020-05-28 10:10 ` [PULL 3/7] gitlab-ci: Remove flex/bison packages Thomas Huth
2020-05-28 10:10 ` Thomas Huth [this message]
2020-05-28 10:10 ` [PULL 5/7] gitlab-ci: Move edk2 and opensbi YAML files to .gitlab-ci.d folder Thomas Huth
2020-10-12 13:44 ` Philippe Mathieu-Daudé
2020-10-12 14:01 ` Daniel P. Berrangé
2020-10-13 14:18 ` Philippe Mathieu-Daudé
2020-11-10 10:59 ` Philippe Mathieu-Daudé
2020-05-28 10:10 ` [PULL 6/7] gitlab-ci: Do not use the standard container images from gitlab Thomas Huth
2020-06-06 10:06 ` Sam Eiderman
2020-06-06 11:49 ` Alex Bennée
2020-06-06 12:38 ` Sam Eiderman
2020-06-07 5:39 ` Thomas Huth
2020-06-07 7:03 ` Sam Eiderman
2020-05-28 10:10 ` [PULL 7/7] gitlab-ci: Determine the number of jobs dynamically Thomas Huth
2020-05-28 16:05 ` [PULL 0/7] Gitlab CI fixes and improvements 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=20200528101039.24600-5-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.