From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>, Cleber Rosa <crosa@redhat.com>
Subject: [RFC PATCH 2/2] GitLab CI: crude mapping of PMM's scripts to jobs
Date: Sun, 2 Feb 2020 22:23:28 -0500 [thread overview]
Message-ID: <20200203032328.12051-2-crosa@redhat.com> (raw)
In-Reply-To: <20200203032328.12051-1-crosa@redhat.com>
This is a crude and straightforward mapping of Peter's
"remake-merge-builds" and "pull-buildtest" scripts.
Some characteristics were removed for simplicity sake (but eventually
will), including:
* number of simultaneous make jobs
* make's synchronous output, not needed because of previous point
* out-of-tree builds
This covers the "x86-64 Linux with a variety of different build
configs"[1]. I've personally tested all of them, and only had
issues with the "notcg" job[2], but it seems to be a test specific
issue with the nested KVM I was using.
[1] - https://wiki.qemu.org/Requirements/GatingCI#Current_Tests
[2] - https://paste.centos.org/view/1dd43a1c
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
.gitlab-ci.yml | 116 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2c7d2198e..eb4077e2ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@ include:
- local: '/.gitlab-ci-edk2.yml'
build-system1:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script: &before_scr_apt
- apt-get update -qq
- apt-get install -y -qq flex bison libglib2.0-dev libpixman-1-dev genisoimage
@@ -17,6 +19,8 @@ build-system1:
- make -j2 check
build-system2:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -31,6 +35,8 @@ build-system2:
- make -j2 check
build-disabled:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -47,6 +53,8 @@ build-disabled:
- make -j2 check-qtest SPEED=slow
build-tcg-disabled:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -67,6 +75,8 @@ build-tcg-disabled:
248 250 254 255 256
build-user:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -78,6 +88,8 @@ build-user:
- make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user
build-clang:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -92,6 +104,8 @@ build-clang:
- make -j2 check
build-tci:
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "staging"'
before_script:
*before_scr_apt
script:
@@ -111,3 +125,105 @@ build-tci:
- QTEST_QEMU_BINARY="x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/pxe-test
- QTEST_QEMU_BINARY="s390x-softmmu/qemu-system-s390x"
./tests/qtest/pxe-test -m slow
+
+ubuntu-18.04.3-x86_64-notools:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n22
+ - ./configure --target-list=arm-softmmu --disable-tools --disable-libssh
+ # There is no make / make check in the "pull-buildtest" script for this.
+ # Question: should it at least be built? Or dropped?
+ - make
+
+ubuntu-18.04.3-x86_64-all-linux-static:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n25
+ - ./configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n36
+ - make
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n45
+ - make check V=1
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n48
+ - make check-tcg V=1
+
+ubuntu-18.04.3-x86_64-all:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n26
+ - ./configure --disable-libssh
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n28
+ - make
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n37
+ - make check V=1
+
+ubuntu-18.04.3-x86_64-alldbg:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n27
+ - ./configure --disable-libssh
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n27
+ - make clean
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n29
+ - make
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n37
+ - make check V=1
+
+ubuntu-18.04.3-x86_64-clang:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n31
+ - ./configure --disable-libssh --cc=clang --cxx=clang++ --enable-gtk --extra-cflags='-fsanitize=undefined -fno-sanitize=shift-base -Werror'
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n33
+ - make
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n39
+ - make check V=1
+
+ubuntu-18.04.3-x86_64-tci:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n33
+ - ./configure --disable-libssh --enable-debug --enable-tcg-interpreter
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n34
+ - make
+
+ubuntu-18.04.3-x86_64-notcg:
+ tags:
+ - ubuntu_18.04.3
+ - x86_64
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "staging"'
+ script:
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/remake-merge-builds#n35
+ - ./configure --disable-libssh --enable-debug --disable-tcg
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n35
+ - make
+ # https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/pull-buildtest#n39
+ # Question: check is disabled on the original script, because the machine
+ # is said to be running VirtualBox. Should this be dropped or should the
+ # machine be tweaked or substituted?
+ - make check V=1
--
2.21.1
next prev parent reply other threads:[~2020-02-03 3:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 3:23 [RFC PATCH 1/2] GitLab CI: avoid calling before_scripts on unintended jobs Cleber Rosa
2020-02-03 3:23 ` Cleber Rosa [this message]
2020-02-03 17:36 ` [RFC PATCH 2/2] GitLab CI: crude mapping of PMM's scripts to jobs Wainer dos Santos Moschetta
2020-02-07 19:34 ` Cleber Rosa
2020-02-08 13:02 ` Peter Maydell
2020-03-10 5:01 ` Cleber Rosa
2020-03-10 9:30 ` Peter Maydell
2020-02-06 13:03 ` Philippe Mathieu-Daudé
2020-02-06 13:05 ` Philippe Mathieu-Daudé
2020-03-10 3:53 ` Cleber Rosa
2020-02-06 13:52 ` Wainer dos Santos Moschetta
2020-02-06 13:54 ` Philippe Mathieu-Daudé
2020-02-06 15:13 ` Thomas Huth
2020-02-07 8:37 ` Thomas Huth
2020-02-07 10:05 ` Thomas Huth
2020-02-07 11:08 ` Alex Bennée
2020-02-07 19:59 ` Cleber Rosa
2020-02-07 16:26 ` Peter Maydell
2020-02-07 19:27 ` Cleber Rosa
2020-02-08 12:51 ` Peter Maydell
2020-02-07 19:46 ` Cleber Rosa
2020-02-03 15:26 ` [RFC PATCH 1/2] GitLab CI: avoid calling before_scripts on unintended jobs Wainer dos Santos Moschetta
2020-02-03 16:08 ` Thomas Huth
2020-02-07 20:01 ` Cleber Rosa
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=20200203032328.12051-2-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@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 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).