From patchwork Wed May 19 18:45:44 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: 12268287 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.5 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,URIBL_BLOCKED,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 BD57CC433ED for ; Wed, 19 May 2021 19:13:55 +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 717096135A for ; Wed, 19 May 2021 19:13:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 717096135A 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]:52968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRdi-0000vq-Aw for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:13:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRCh-0000A2-RA for qemu-devel@nongnu.org; Wed, 19 May 2021 14:45:59 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRCg-00057U-Eb for qemu-devel@nongnu.org; Wed, 19 May 2021 14:45:59 -0400 Received: by mail-wr1-x432.google.com with SMTP id y14so12989869wrm.13 for ; Wed, 19 May 2021 11:45:58 -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=bp3Jtw7C12/rHMWvD6mwBuDijE8hJ1LIDyBcdtavfR0=; b=eRL1oQ7k4OAZrjzf+Cg9MhvHn1GF8kARINOK2hGKPEP4RKhMalANhvSyQ1LfYOz2EZ tnzTp0EIaDdz+PnHDJ+NyDxFRhFcGOk1b/nCvqLKODj5lQxswYQ6u8mcl/eC1Nt3OohX 1BzPAlAn2/fyEv6juCsszphSwRCeZyOY+nQMKVYdOfI6B+/K5SQ0yKABnocXJGB1bMqx BX9/NbA7tkga6mO6eSvHpHZIDM3sXU/AOl5omEiildX8W7AAj+AZmR8Nn+/v6LrWDAlb SSHsFCw6CyRm7CO8She88lO9E4TNiefNK77TizyHHlFwc/wYhhU3IGTOaUps9QDS6aEr 8/aA== 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=bp3Jtw7C12/rHMWvD6mwBuDijE8hJ1LIDyBcdtavfR0=; b=i9bT1KjO0/jvizGMUfbuDmfeda8BFZqKuiy3rLywTAX16dHAEOnl08/15421F97xbr oXD12+SVGdkejdT2wtKuk1N6E0/+Gba9AuEQq/hT2IUqIwN7mKhKYcSlTqMa+SNDIfqY zy6mP38LJ+oieCDdgA+cLiXwzmtYKyOyuN/tECqHtP0sgaNAWh4rA4p52TRAONWGrTah PgeGBlL7oskN/748GDmd8FrXwlU2DJx35PIanGsHmSoalpCFHwpXpDt61rEUdq2GU2xB S9P+bCWLHX+ESjsPMmqfnWD7LtJh5vApl/j8A0D7+YdCxsZrDD60A51eKs0cS8IlJH4Y A8aA== X-Gm-Message-State: AOAM530w2HZeeg40AwxW5BitIR9SWP0Hjxg0HzOOcO1XBCOdB0Ob5zof fQkP5AXMsOIEtLzDnTFy73MeFotGzZHSNw== X-Google-Smtp-Source: ABdhPJy98CEDzJcOVI7pOSMEaz4qPljb431cmvTUb7YZrx6XitouBehjvbGdJMHDDKnHlX5qP85hKQ== X-Received: by 2002:adf:dc8a:: with SMTP id r10mr327405wrj.119.1621449956622; Wed, 19 May 2021 11:45:56 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id a11sm247625wrx.38.2021.05.19.11.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:45:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/6] gitlab-ci: Extract &environment_variables template Date: Wed, 19 May 2021 20:45:44 +0200 Message-Id: <20210519184549.2192728-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To be able to set the same environment variables to multiple jobs, extract what we currently have as a template. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-template.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 32aaef1a213..58b01744751 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,8 +1,11 @@ +.environment_variables_template: + before_script: + - JOBS=$(expr $(nproc) + 1) + .native_build_job_template: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - before_script: - - JOBS=$(expr $(nproc) + 1) + extends: .environment_variables_template script: - if test -n "$LD_JOBS"; then From patchwork Wed May 19 18:45:45 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: 12268285 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.5 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,URIBL_BLOCKED,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 A2A3DC43460 for ; Wed, 19 May 2021 19:13:15 +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 3ACC6613B6 for ; Wed, 19 May 2021 19:13:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3ACC6613B6 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]:52086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRd4-0000Io-2M for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRCn-0000Gn-L7 for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:07 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRCl-0005AD-2e for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:04 -0400 Received: by mail-wr1-x435.google.com with SMTP id a4so15116360wrr.2 for ; Wed, 19 May 2021 11:46:02 -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=uOMO62Q92IuNdNSfONgd4MnSVajL3jCH8wZPtpwgeBk=; b=Y98e67dpeXKqeI+2AZbWshcySi/SwNQlRpYqnfMdi8llt/jw+5i9it+hthnuHRCcca 7DFGv07614TmdjD421rOAQl1tdzxqQrNC1IDCxRcrFUhusoM59Le2N07GVsEIdzAyiVs 42jWQEUj8rIAfrDLLV3TUygUpkxD+aDO1yXoTPyzU2Ae5I4qTxmi944G2IRZNJkiM+H7 ubKoC8vBvuG9YFk7akZ4Ylw5nMGJFqZYPmZuvlHxiFMDZ3gY/WS+sEH6Di08+7tDeRWq V5T9lsIgBYHvuxRUPTHpp0YOCsKHFBiket2et+kqAkW3dgqr3S60syln6ONWkmmVVpJY OF9A== 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=uOMO62Q92IuNdNSfONgd4MnSVajL3jCH8wZPtpwgeBk=; b=NP6AiXY0Nj19Wt4JvX+Zuai6Kq97IEfgXohjjvM/8YYPKJXX0QsqG5nowGFJJ8gQ5F v0VIQiNSRAxgYVerI1/zE4ib94tjNhGlJBoZAZ7RJ1SvbYV4kT6O17claBCesm7y4NTm iU9mYMYm0q2PaqBIzD03LzLNaQBVrOdHHdRNHnCijiJUcbCwTIzc+gfJfLetY5KdKnG0 iRb6jGjcc9PtisGm1f/P2nU6OPCIgCSWku9yK1aF1UmsolZMo0slcQBTR4II7rVKNAwJ ZRhy4lbFPWlxr5+kwz1pg9eahyEemHiJDz5AqHnDNr2XJhYlgW/cB70XLtc9qqyRj8Jm xDzQ== X-Gm-Message-State: AOAM531AIZmIbpw4xeYP3zrtF8yqNPubkYnCrAiY5DW2LwX2iA4zzbhH hKpKEPb/hDm2Uc6H4QM+aF6a82bsJDWOrA== X-Google-Smtp-Source: ABdhPJw0iL6ts75u0hDpzdQwyQJDKeO4qdpxb1X/Mo6TOMdQdJcx+qoto53eL0Z5mUtdnvoDQ6U0iQ== X-Received: by 2002:a5d:62c7:: with SMTP id o7mr345843wrv.372.1621449961484; Wed, 19 May 2021 11:46:01 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id v12sm199005wru.73.2021.05.19.11.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:46:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/6] gitlab-ci: Adapt JOBS variable for FreeBSD runners Date: Wed, 19 May 2021 20:45:45 +0200 Message-Id: <20210519184549.2192728-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 'nproc' is not available on FreeBSD: $ JOBS=$(expr $(nproc) + 1) bash: line 119: nproc: command not found expr: syntax error Instead, use 'sysctl -n hw.ncpu'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-template.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 58b01744751..fe4f18595ac 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,6 +1,16 @@ .environment_variables_template: before_script: - - JOBS=$(expr $(nproc) + 1) + - if + test $(uname) = "FreeBSD" + ; + then + JOBS=$(sysctl -n hw.ncpu) + ; + else + JOBS=$(expr $(nproc) + 1) + ; + fi + - echo "=== Using $JOBS simultaneous jobs ===" .native_build_job_template: stage: build From patchwork Wed May 19 18:45:46 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: 12268327 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.5 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,URIBL_BLOCKED,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 23E2DC433B4 for ; Wed, 19 May 2021 19:26:35 +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 D947F6108D for ; Wed, 19 May 2021 19:26:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D947F6108D 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]:36480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRpx-0003wc-Fd for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:26:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRCs-0000Jz-JT for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:11 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRCq-0005C6-19 for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:09 -0400 Received: by mail-wr1-x42f.google.com with SMTP id q5so15072348wrs.4 for ; Wed, 19 May 2021 11:46:07 -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=bxIn0INwdcSb5lb9f8fZG1avNfdlG4L8wrUYhmTwTc0=; b=EppczxByJXAMutDFYy/13i2SzyQrC74vxvsbe1iy+rryBZHrjjOf4akdT9dHyRdr2B KT997xM0z516IoKlUSup76Bhq0ZHUDcHq2Ltro+5MNerE8niJ8KEwwsKEC3grwIpZsrG qqFQ/o1QbMhwNhlkYjdR5qQRmIOHnPlFewrqsVmHZVPZTlY23X8IHzXZcGNeetd8xqag W2O3zpLIbMJQ4r155gR2g4NDYCj9D4HX+JDRIwXG3rUQfvjhy+q6o6MlI7O48FtrlXDz vD7hZlmpRE9dEBj0aNYu688SvDYAwC50w8oFuimzNMlnSo9Zz02GlGSnhqKh5uRS0CLk SRew== 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=bxIn0INwdcSb5lb9f8fZG1avNfdlG4L8wrUYhmTwTc0=; b=Z8zXWOPI1bNeBaRlUNKss+JuTtthHvP5p729/EGECyMuQpnXXQfdsHmP3Y5utitMhU TTzLbdNS7I6HXVyhjPd03IGNPiZh7y4tVn4wpK5oM+h4HgbTXgShoqCmZ8nVi8l8STtP ItFIKPnHeyLMp4BL1QG8L81seO0J9n8y74ne046fT59gXxg7i/b9Iq2Zvc/B2SWvU9g7 3YmbrYjd5jju8aTkqjpvpHGaSqQh22Zjzu0AtooDFuqSOcBUeoj5dOhmZTdyUN4tGXg1 Q2zEh4N3OcvP3P0iz/O9jMvLdYZcpAEvWWHkR5GzOo3KYFzoYnAgEsLfbPWMJHg041hj 2fAA== X-Gm-Message-State: AOAM530LAWv8nr7o9UMAzsoeWX5NrE7SOGncr6Xnfyl3nsVbpXF6Zdys b9CVRPokstRL5u4F9eL5yS8yrPuFT9KISg== X-Google-Smtp-Source: ABdhPJwwbMV/JrSZaaTi1Dgj3phWxe+dRSVIXgwPv431LHQLVLTC32niwYXvV3dt4rzpji8tJm48rA== X-Received: by 2002:a5d:6b43:: with SMTP id x3mr324999wrw.263.1621449966468; Wed, 19 May 2021 11:46:06 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id d3sm208820wri.75.2021.05.19.11.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:46:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/6] gitlab-ci: Run GNU make via the $MAKE variable Date: Wed, 19 May 2021 20:45:46 +0200 Message-Id: <20210519184549.2192728-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add the $MAKE variable to call GNU make, and set it to 'gmake' on FreeBSD to avoid: $ make -j"$JOBS" make: Unknown modifier ',' make: "/builds/dTyar424/0/qemu/build/Makefile" line 3: Need an operator make: "/builds/dTyar424/0/qemu/build/Makefile" line 4: Missing dependency operator Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.d/buildtest-template.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index fe4f18595ac..f284d7a0eec 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -5,9 +5,11 @@ ; then JOBS=$(sysctl -n hw.ncpu) + MAKE=gmake ; else JOBS=$(expr $(nproc) + 1) + MAKE=make ; fi - echo "=== Using $JOBS simultaneous jobs ===" @@ -33,22 +35,23 @@ then ../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ; fi || exit 1; - - make -j"$JOBS" + - $MAKE -j"$JOBS" - if test -n "$MAKE_CHECK_ARGS"; then - make -j"$JOBS" $MAKE_CHECK_ARGS ; + $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ; fi .native_test_job_template: stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + extends: .environment_variables_template script: - scripts/git-submodule.sh update $(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=":" - - make NINJA=":" $MAKE_CHECK_ARGS + - $MAKE NINJA=":" $MAKE_CHECK_ARGS .integration_test_job_template: extends: .native_test_job_template From patchwork Wed May 19 18:45:47 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: 12268293 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.5 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,URIBL_BLOCKED,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 EF03AC433B4 for ; Wed, 19 May 2021 19:16:47 +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 A2FDB61073 for ; Wed, 19 May 2021 19:16:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2FDB61073 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]:33016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRgU-0006mV-HD for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRCz-0000Nu-LK for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:18 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRCv-0005EV-Hm for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:16 -0400 Received: by mail-wr1-x430.google.com with SMTP id a4so15116899wrr.2 for ; Wed, 19 May 2021 11:46:12 -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=2IUveWwI0J+7Ncapudv20RtB39QJD/A5pUhEcIazkKo=; b=Iha3kwznX10Vc2kZfXhF4IUMmUUULi6iUKyIc2jGnFDz3PkqySZhZdKeDBfLEuG9+u OqWTiSo/9pFqsHy/LvLYXsnH7VMxRpA+i0YA6Z1GHTE6CwOnoFzkhlYFBp1UhRKM81Mw AjECJVB6BwXCyFjlIY9Nz0XVWt9Yxyxq8SJpHuRYY2ZzeRJ9GCzNXBmd7T3qLq39aiGk ZsiOjKbag0jxFQHJT4ecUO2w+qtKumJ0jk/It3MxehrwOJ69xwi0W630x1BRsWTnfbCU TuVvL19IMSx5kUhEATN1IsXpAEergvLXr7Uu2Rr8WFPwAHjky4+qNqV85iGJf+kfn12N O/AA== 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=2IUveWwI0J+7Ncapudv20RtB39QJD/A5pUhEcIazkKo=; b=tm/mf/gpAOQgruN9iy16PzLtmZfFGxmQnGbRhBZgdTA08WK+PAjBxLpTVBp0Oe/A90 hVybXX5UvuTgvOLo8/Zp3HW3TAzbG0ObPaphjdnyqXTqQFFGSFo0XjdtMWaITlbgLTm/ XLVbkQTchpgGV07gHC6FRW0dH+C5xz/MlrMe0yGtWjaEqT5pLfz2H+IHjKdhOHhQTH44 yh8nAR8zdl9h+KZ951nvIeXJL38QTMxbTwupA+pICx3XGUvxbG3sZjKhbpPf5tq76D6/ mF8qo5NKD97zpVaC1EGwzlZ0KUq8L7EayV+3ePVnasBsPJsKYxtfxCPKRprB3+D4y1JI fDiw== X-Gm-Message-State: AOAM533yNUUcpPxykv+5U2u/9zTBWV34aSCm0Rsw5JIlsjbEEp7GWNfR svTa9Va9+ES10QKbQy1NRMCqoRHDny8o5w== X-Google-Smtp-Source: ABdhPJz6qo42P1rSeb0ij8vialaqMI3Lr87/6qVJzJQ6zp0AffaydltfhKYhYGf65P7pzR/MbFoNww== X-Received: by 2002:a05:6000:1b8a:: with SMTP id r10mr355872wru.296.1621449971326; Wed, 19 May 2021 11:46:11 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id x2sm2553247wmc.21.2021.05.19.11.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:46:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 4/6] gitlab-ci: Add ccache in $PATH and display statistics Date: Wed, 19 May 2021 20:45:47 +0200 Message-Id: <20210519184549.2192728-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If a runner has ccache installed, use it and display statistics at the end of the build. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-template.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index f284d7a0eec..a625c697d3b 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -6,13 +6,18 @@ then JOBS=$(sysctl -n hw.ncpu) MAKE=gmake + PATH=/usr/local/libexec/ccache:$PATH ; else JOBS=$(expr $(nproc) + 1) MAKE=make + PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH ; fi - echo "=== Using $JOBS simultaneous jobs ===" + - if command -v ccache > /dev/null ; then ccache --zero-stats ; fi + after_script: + - if command -v ccache > /dev/null ; then ccache --show-stats ; fi .native_build_job_template: stage: build From patchwork Wed May 19 18:45:48 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: 12268303 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.5 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,URIBL_BLOCKED,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 9A01AC433B4 for ; Wed, 19 May 2021 19:18:54 +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 27D9E610E9 for ; Wed, 19 May 2021 19:18:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27D9E610E9 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]:41278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRiX-000437-40 for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:18:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRD5-0000SP-C7 for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:23 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:34528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRD0-0005H8-Th for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:20 -0400 Received: by mail-wr1-x430.google.com with SMTP id r12so15095172wrp.1 for ; Wed, 19 May 2021 11:46:17 -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=3SkTTNfbgrgPZRsbTajuJ3tzgEyu0ZeYqUT1Kjom0eE=; b=kFF4R7Cem/qf1QxILFeMqttHYRR9hyQNSpW2Gh1mskOSZTlXXSaiArXIYdVywxd/nk WyNEMBKrgxVwTyS740ESbGZMTKdZlNFK5MZ0fhAWIMSl/nPycAKq64FOThAV2tGk+Cek Qysx3N0Cul1qqcquIkhoqWsYCjfnix5+vj7r3OfGEaCokNHxgopRxg4vw9OHoaZ/B0AS 08onmKOh5x9i18pULenBgqzsCN9syBUCg+IVascrjh8dqqS8aWTvmZjcW7Q0bdOY9KiE kcjDqmSV0d4Q4BnzdPYq/gXAvRzD9+DAmg2Emw6k6qPwAZqb1MPCFGOywsMlTAB849bQ NhBg== 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=3SkTTNfbgrgPZRsbTajuJ3tzgEyu0ZeYqUT1Kjom0eE=; b=JiBpmv5WEP2lsgEMJG4Eq1UFv2ciyr5k/2BrlASX/MjU9RlqQmg8+WC1y9fwxbFrkZ RjD0/naWwNNz+i0YlwLeBKTqihwBgfsQRmQgrh0LcVJGNtzEyDJ1jODOptEAGdBkXgLg clpCy4Uyh/4YboZnEwcOFucRXwSv6EmbvWxIlwepmeVoEptoyNuEfLbtEmZMnQyGwESt adEhsfUvnqcWxb9nGThxj5bibO33/l2vV9mdS7HXa9Dsqb2Lr9toCLtmsObz0rxi7g1t ZwtDPaBjcNJ73cAy+hMaL1HUkIhpDn87e10q5diNefyQVW8IpxFlARTsFRRDafk/fvT2 Ma2Q== X-Gm-Message-State: AOAM530gNTt4/k+KmHFtbdfXPi9uWHTwPFFZsjDvf+pn8b5IE5n60i9m OdS6qnMBWLFtcHm36T3Jutnt/wHgCCPiAA== X-Google-Smtp-Source: ABdhPJykWaRlBReyfgx3Yts2YqRxaVjNoTkhAMhrZm6+Pb/rLSpBY1r5HCrpoZZWIy6rJ4bRzRAkrA== X-Received: by 2002:adf:aad8:: with SMTP id i24mr385205wrc.0.1621449976437; Wed, 19 May 2021 11:46:16 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id v20sm270550wmj.15.2021.05.19.11.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:46:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/6] gitlab-ci: Simplify before/after script for Avocado based jobs Date: Wed, 19 May 2021 20:45:48 +0200 Message-Id: <20210519184549.2192728-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-template.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index a625c697d3b..f968fa1ad99 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -74,7 +74,7 @@ - build/tests/results/latest/test-results reports: junit: build/tests/results/latest/results.xml - before_script: + script: - mkdir -p ~/.config/avocado - echo "[datadir.paths]" > ~/.config/avocado/avocado.conf - echo "cache_dirs = ['${CI_PROJECT_DIR}/avocado-cache']" @@ -85,6 +85,9 @@ du -chs ${CI_PROJECT_DIR}/avocado-cache ; fi - export AVOCADO_ALLOW_UNTRUSTED_CODE=1 - after_script: - cd build + - find . -type f -exec touch {} + + # Avoid recompiling by hiding ninja with NINJA=":" + - $MAKE NINJA=":" $MAKE_CHECK_ARGS + after_script: - du -chs ${CI_PROJECT_DIR}/avocado-cache From patchwork Wed May 19 18:45:49 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: 12268313 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=-21.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 D7235C433B4 for ; Wed, 19 May 2021 19:22:59 +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 68820610E9 for ; Wed, 19 May 2021 19:22:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68820610E9 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]:49478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRmU-0001t7-Hh for qemu-devel@archiver.kernel.org; Wed, 19 May 2021 15:22:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRD6-0000Xr-RD for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:24 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRD5-0005JR-58 for qemu-devel@nongnu.org; Wed, 19 May 2021 14:46:24 -0400 Received: by mail-wr1-x42c.google.com with SMTP id v12so15073227wrq.6 for ; Wed, 19 May 2021 11:46:22 -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=tgSX/LGDpg9kR/VLumzVDItz5dEMkMShrSHH51Rq6pY=; b=LyrYMArCHKNTZ+dZZOZ2Ls8+3hX27+UfsoVxtTHKosSZlV/qen7CA08zPjPxdHICMZ Usc/UD9KSs8BgeaAzFfmyHVxRi7mkfpaqybWm/TZasmvNnd8ziZ5BN4TjXjaO2Y38nMx mJq1yuNEysimFlOroIYpms9oKf4DHUZRyOTMk1n6CvdCvsDNOhMCDb38kQpBVUCS0OBW NN0XAxfbb+eA5Q0bSkyQSmCREETj9tZUlX0GMSU0BJQDciMmNZEqyr6a8czncHDt8Dgv GIHYm/UxQCNihMT37ZsODnH8ucBtb3KutIZCL7EaCjrZzIoDRPHdGhrPkmbWmXzdjzCu uaew== 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=tgSX/LGDpg9kR/VLumzVDItz5dEMkMShrSHH51Rq6pY=; b=DRjUWY5UojDTX8t8lq7+5p24vXsG3Qk1jvTIBa5xbd1SjWPSXYIF7izx9oanZXq5Fe zqXUD1MjL3RIKpKBQ0kJsu/kJXYePurd+NescbNH9nbB3+6QpAmMzurfqn/fI+dY2HD/ We9K4KxxY/Qf9fXAEy75SkErY/ZFng7e2sBsa+d5ZtBelp5kbbqIxs6ef+1RAhDiwOP3 BT8dCD428MTFdUMUCf9aBDOaAkSfR3w1ELxI08HwKeyNxJWz4D0ca8M12sVDsFa3SFf6 BWfSmB9U4k9/u3QZGDeRoeFA3LRDb1RF5XuF42JaMi4Ol7UBmQdRKIbJxqggPT6D5oLQ pSIg== X-Gm-Message-State: AOAM530k5eWjWX1ACifstOMQQy+sad3b8JGm0NZ8AUmvS7PGZ25VRHte 0xoD2eb1QgWIkHnUG1Ee+AgYVRPiuJz8sQ== X-Google-Smtp-Source: ABdhPJwu3MU2HWGzdmQ5m3R4pr/aRtgrOf9ewMrIHQm21Kb7nJvk35iZR5w/EdOt0C2jPy2566TbDA== X-Received: by 2002:a5d:508e:: with SMTP id a14mr376839wrt.88.1621449981324; Wed, 19 May 2021 11:46:21 -0700 (PDT) Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id x2sm2553550wmc.21.2021.05.19.11.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:46:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 6/6] gitlab-ci: Add FreeBSD jobs Date: Wed, 19 May 2021 20:45:49 +0200 Message-Id: <20210519184549.2192728-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519184549.2192728-1-f4bug@amsat.org> References: <20210519184549.2192728-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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 , Kyle Evans , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add system/user emulation jobs on FreeBSD host. To build these jobs, you need to add a FreeBSD runner and add 'freebsd' to the QEMU_CUSTOM_RUNNER variable in your GitLab project. Reviewed by: Warner Losh Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-freebsd.yml | 59 ++++++++++++++++++++++++++++++ .gitlab-ci.d/qemu-project.yml | 1 + 2 files changed, 60 insertions(+) create mode 100644 .gitlab-ci.d/buildtest-freebsd.yml diff --git a/.gitlab-ci.d/buildtest-freebsd.yml b/.gitlab-ci.d/buildtest-freebsd.yml new file mode 100644 index 00000000000..bfaeff89330 --- /dev/null +++ b/.gitlab-ci.d/buildtest-freebsd.yml @@ -0,0 +1,59 @@ +include: + - local: '/.gitlab-ci.d/buildtest-template.yml' + +.runner_freebsd_template: + rules: + # To enable this job template, add 'freebsd' to the QEMU_CUSTOM_RUNNER + # variable in your project UI via Settings -> CI/CD -> Variables + # https://docs.gitlab.com/ee/ci/variables/README.html#project-cicd-variables + - if: $QEMU_CUSTOM_RUNNER =~ /freebsd/ + when: always + - when: never + tags: + - freebsd + +build-user-freebsd: + extends: + - .runner_freebsd_template + - .native_build_job_template + image: + variables: + MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --disable-system --python=/usr/local/bin/python3.7 + +build-system-freebsd: + extends: + - .runner_freebsd_template + - .native_build_job_template + image: + variables: + TARGETS: aarch64-softmmu avr-softmmu hppa-softmmu ppc64-softmmu + riscv64-softmmu s390x-softmmu x86_64-softmmu + MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog + --python=/usr/local/bin/python3.7 + artifacts: + expire_in: 2 days + paths: + - .git-submodule-status + - build + +check-system-freebsd: + extends: + - .runner_freebsd_template + - .native_test_job_template + needs: + - job: build-system-freebsd + artifacts: true + variables: + MAKE_CHECK_ARGS: check + +acceptance-system-freebsd: + extends: + - .runner_freebsd_template + - .integration_test_job_template + needs: + - job: build-system-freebsd + artifacts: true + variables: + MAKE_CHECK_ARGS: check-acceptance diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index 64cb2ba1da5..5dcf1d34c5b 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -8,4 +8,5 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/buildtest.yml' + - local: '/.gitlab-ci.d/buildtest-freebsd.yml' - local: '/.gitlab-ci.d/static_checks.yml'