From patchwork Mon Feb 3 03:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cleber Rosa X-Patchwork-Id: 11362005 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61A0A1395 for ; Mon, 3 Feb 2020 03:24:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11AE020679 for ; Mon, 3 Feb 2020 03:24:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TvsMFnAK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11AE020679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iySLR-0007kD-AA for patchwork-qemu-devel@patchwork.kernel.org; Sun, 02 Feb 2020 22:24:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48933) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iySKq-0006wE-IN for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iySKn-0006bX-O5 for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24668 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iySKn-0006ZE-CM for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580700215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSfVzIY2Eh/M2qcokLoz7G/taN1bzWjWGQ7jvg3vPb4=; b=TvsMFnAK7zBDplXHKQYS7zF3DR+hQeB/qg5qYQ3CpTQcUy5VvHZpFgPRXbB426SpxLwZyc ehwuMi+THnvkLi7FPbeDAxsORgeuuMBHWpEdAKdp8mb9rrphYqo5tB/0wFUP2EQNYLk5k0 ETpruZHj4c1NwLLtbDpU/rspSb+hvKs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-Px9fIAG-PIifkpwDKOMwaA-1; Sun, 02 Feb 2020 22:23:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F31C1005510; Mon, 3 Feb 2020 03:23:30 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-247.rdu2.redhat.com [10.10.120.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D38F786C4A; Mon, 3 Feb 2020 03:23:29 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [RFC PATCH 1/2] GitLab CI: avoid calling before_scripts on unintended jobs Date: Sun, 2 Feb 2020 22:23:27 -0500 Message-Id: <20200203032328.12051-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Px9fIAG-PIifkpwDKOMwaA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 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 Reviewed-by: Wainer dos Santos Moschetta Acked-by: Thomas Huth --- .gitlab-ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 228783993e..d2c7d2198e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,10 @@ include: - local: '/.gitlab-ci-edk2.yml' -before_script: +build-system1: + before_script: &before_scr_apt - apt-get update -qq - apt-get install -y -qq flex bison libglib2.0-dev libpixman-1-dev genisoimage - -build-system1: 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 @@ -18,6 +17,8 @@ build-system1: - make -j2 check build-system2: + before_script: + *before_scr_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 @@ -30,6 +31,8 @@ build-system2: - make -j2 check build-disabled: + before_script: + *before_scr_apt script: - mkdir build - cd build @@ -44,6 +47,8 @@ build-disabled: - make -j2 check-qtest SPEED=slow build-tcg-disabled: + before_script: + *before_scr_apt script: - apt-get install -y -qq clang libgtk-3-dev libusb-dev - mkdir build @@ -62,6 +67,8 @@ build-tcg-disabled: 248 250 254 255 256 build-user: + before_script: + *before_scr_apt script: - mkdir build - cd build @@ -71,6 +78,8 @@ build-user: - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user build-clang: + before_script: + *before_scr_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 @@ -83,6 +92,8 @@ build-clang: - make -j2 check build-tci: + before_script: + *before_scr_apt script: - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64" - mkdir build From patchwork Mon Feb 3 03:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cleber Rosa X-Patchwork-Id: 11362007 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 425FF92A for ; Mon, 3 Feb 2020 03:24:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 196572073C for ; Mon, 3 Feb 2020 03:24:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I4/4GjZk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 196572073C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iySLe-00082z-93 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 02 Feb 2020 22:24:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48981) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iySKz-000792-P3 for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iySKy-0006nb-2h for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:49 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45725 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iySKx-0006mY-Uw for qemu-devel@nongnu.org; Sun, 02 Feb 2020 22:23:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580700227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OfUgKlR/8KIrFNbEyaLSZ2giQ7efZg8jwE2iQSoOOmc=; b=I4/4GjZk1WNPKQ6qiE71WuCWF74ZZFIY5oIngZEVld5cXJ9VpQyWfRgwcPhy/fbnZhRqmz PrmO1t+YSEtscnZWn1Si1DBuwitCK2a4y98cGgBAop503FJX/BeRVX7/OX0kGAdnwr0uVQ Cg+K5D43//YLEGMF5XNxCrY+vn9ZTro= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-RfDZ_LAtNEitCobA7OZNug-1; Sun, 02 Feb 2020 22:23:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C3B186A075; Mon, 3 Feb 2020 03:23:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-247.rdu2.redhat.com [10.10.120.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 949BA86C4A; Mon, 3 Feb 2020 03:23:30 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Subject: [RFC PATCH 2/2] GitLab CI: crude mapping of PMM's scripts to jobs Date: Sun, 2 Feb 2020 22:23:28 -0500 Message-Id: <20200203032328.12051-2-crosa@redhat.com> In-Reply-To: <20200203032328.12051-1-crosa@redhat.com> References: <20200203032328.12051-1-crosa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: RfDZ_LAtNEitCobA7OZNug-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- .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