From patchwork Sun Apr 18 23:34:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12210545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF62C433ED for ; Sun, 18 Apr 2021 23:46:58 +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 BECAD6100B for ; Sun, 18 Apr 2021 23:46:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BECAD6100B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYH7w-0003Rj-R5 for qemu-devel@archiver.kernel.org; Sun, 18 Apr 2021 19:46:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYGwr-0000na-7p for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:29 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:41819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYGwp-0003C2-Gi for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:28 -0400 Received: by mail-wm1-x32d.google.com with SMTP id o21-20020a1c4d150000b029012e52898006so7432587wmh.0 for ; Sun, 18 Apr 2021 16:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GiGPjIPUchqYBK2KNH58Rypm9hg2GtmV2AFVIAdCZkA=; b=AFvudnFRtRLINKpFrciZxdXQOQOkjdy3yEP4JZZAtlAL4N+0CIcRy58ISKrW5YTibn xcFTKbh+xdvLzwfKwlkjG2R1zd1zFVnsNJAidFbM0AQmZ/PJd99An7q1Sx26jP3ue9Dm W9beiBPSKVh5LBZkAeQtbEAiVNpYmjsIGSmHfbfvH6lRc5NtIk4Fp7e12cYV8a1mMqU0 mjbewNzfjBlxxTEMgIqA7cwyWraXGWl7yzqjC5RpK3eJy6iXDzd5elL6+XZv6tnDRqWb /QyUEg9tkDAJ6NxiD28WQXBLODHlndpNugpHD+CNVVSdhIOtxhHFfZNHqGxVmCxPkfSB vwBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GiGPjIPUchqYBK2KNH58Rypm9hg2GtmV2AFVIAdCZkA=; b=RsaTFiOn0XU0nD51CuIv7AvfcyEC7z6Ho/YQN76A0k25RK8o5WcMZC9eaNF/OqUOxq HD0zDmI0DvwXj14oOfjzv/nSnM8gxhaNVatVhvqJd38qUODCt1dN5GARY4Z9EoFPBoD2 Nqg+q7cO9xOyncmNfuG9xHLrNm9loeVFPNd/T1CXxAdv2KjWdQ5nu3t0qLo/Lk493+Py RqPAXjx8RrzVC1d6p+2rVxTUG3pv5CpogckXefRY1o+vX+0z1lZIkgDWdgg/ympxfc2K I2FY7zg/0/XCYb2kC5ce+lt7pxzafvaFJ3Yu4YBKcNABBrQRkdUc+xfBWTDxUBq4nM4J eLLw== X-Gm-Message-State: AOAM533X83h6xkpPyraewWA4bEhrz1w0OEvnZQinrWNQrjN3R5efOjNC I5ZRfofuifBlRudTGN1Y7PIRE4h1o7XdVw== X-Google-Smtp-Source: ABdhPJyVSwxXALi3+UZDcTYHXHwJdqvDPn5iOm+ngO1Jc+Ipws4FnNglgW0NrtXa45M06t1VGP9xoA== X-Received: by 2002:a05:600c:4fd0:: with SMTP id o16mr13767522wmq.140.1618788925976; Sun, 18 Apr 2021 16:35:25 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id 3sm20534240wma.45.2021.04.18.16.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml Date: Mon, 19 Apr 2021 01:34:40 +0200 Message-Id: <20210418233448.1267991-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Erik Skultety , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , Miroslav Rezanina , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Extract the crossbuild job templates to a new file (crossbuild-template.yml) to be able to reuse them without having to run all the jobs included, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/crossbuild-template.yml | 41 ++++++++++++++++++++++++++ .gitlab-ci.d/crossbuilds.yml | 43 ++-------------------------- 2 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 .gitlab-ci.d/crossbuild-template.yml diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml new file mode 100644 index 00000000000..bc790a43486 --- /dev/null +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -0,0 +1,41 @@ +.cross_system_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-user --target-list-exclude="arm-softmmu cris-softmmu + i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu + mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +# Job to cross-build specific accelerators. +# +# Set the $ACCEL variable to select the specific accelerator (default to +# KVM), and set extra options (such disabling other accelerators) via the +# $ACCEL_CONFIGURE_OPTS variable. +.cross_accel_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 30m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build + +.cross_user_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-system + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 2d95784ed51..7a0d2069c14 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,44 +1,5 @@ -.cross_system_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 80m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-user --target-list-exclude="arm-softmmu cris-softmmu - i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu - mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - -# Job to cross-build specific accelerators. -# -# Set the $ACCEL variable to select the specific accelerator (default to -# KVM), and set extra options (such disabling other accelerators) via the -# $ACCEL_CONFIGURE_OPTS variable. -.cross_accel_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 30m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build - -.cross_user_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS +include: + - local: '/.gitlab-ci.d/crossbuild-template.yml' cross-armel-system: extends: .cross_system_build_job