From patchwork Wed May 12 05:37:09 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: 1477426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=t8T28AY+; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3V943ZRz9sWQ for ; Wed, 12 May 2021 15:38:09 +1000 (AEST) Received: from localhost ([::1]:50004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghZP-000160-AQ for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:38:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghYj-00013D-O4 for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:25 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghYi-0006V0-Ef for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:25 -0400 Received: by mail-wr1-x42e.google.com with SMTP id x5so22274717wrv.13 for ; Tue, 11 May 2021 22:37:24 -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=t8T28AY+FdbEwu5EBAwRUTJW8quXTPh6JSKAE2DfJthIhtR6L6s+lOR6RbSknjOPvC aQDGOqkDEbHL+b28tDsP+f1Z7XGKpNykzHoiRZW721Hzv6BVmqwqtqB2F85glreURnKd aIO3ItioeloO5V1ZrKqXYHYHPrEtiinu2J8dg+F4BGtRaT2XDkM0sZW72UlgFQeUlttz haUNUXA2fyYM5I2j3bUjKEeqsa/FSFoQK1/ti6psarNBnkofMa/IPTqIP0pKwe2AjoNM icEZ/MaYrm+CqUndWUomNQZ0DAdDcNW2YzBKvygOdiqNU5mZGfJ7WfiWUOtka4R/eB4k UPvQ== 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=kaEgTD5Y0XbyL5xjWjMH/1P7458dvVDWuPqgsFxjcWKwdkjHyB3mQDmfm9CyU1KEox fkPR/CN2ziU0+rLoA9YrpF6g3rvrJSAjRHS/ymqnFJmKnjFBkAo4tUra4B4XRQFFyzwR lLKj5z/1J+WQYuS6Mq8xldWhq+Z5cBZik1uASJf9/Z6fSb7lcqQcigyuJKWnBL3dWMYm XKiMrmwXp8rFF7SJpMUp8CH8F5ny+hyzZELMspbwVz41qzAX+RRT5VjAz6FhMCWJ3IUk /TABCw7IcuBuVjQ7vwZh6rtg31knu/2wvr1e9zOB0Dq+wMkV/dalznsdDg0go2m1SB/q NEbg== X-Gm-Message-State: AOAM531czjgrW6mTqMYAc5MlQsIN/HT45wMXKxGluJvTPHmi3uq99kbO fnKmM02GJigEjUdOwQgDJEMVRs6hY1KpsA== X-Google-Smtp-Source: ABdhPJyY29fWyOzIAxzQ/+rqBzDDAlA62cnateuuBu5X4ST3wAH7RR40BTylQFiLvwwJrEYzduJvGg== X-Received: by 2002:a05:6000:1567:: with SMTP id 7mr43047983wrz.300.1620797842988; Tue, 11 May 2021 22:37:22 -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 t11sm4359041wrz.57.2021.05.11.22.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/6] gitlab-ci: Extract &environment_variables template Date: Wed, 12 May 2021 07:37:09 +0200 Message-Id: <20210512053714.3268162-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.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é --- .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 12 05:37:10 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: 1477427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EIRg2spG; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3VP271tz9sWQ for ; Wed, 12 May 2021 15:38:21 +1000 (AEST) Received: from localhost ([::1]:50414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghZb-0001Mq-8u for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:38:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghYq-0001IP-02 for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:32 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghYo-0006Z3-IF for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:31 -0400 Received: by mail-wr1-x42b.google.com with SMTP id n2so22347377wrm.0 for ; Tue, 11 May 2021 22:37:30 -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=EIRg2spGMghwhaoSxQP4ls8MW4t3Vadh0h1NdN3QG9d2zkcZHtpFNfshqc/JUIlVf2 +Y1E5UlGwDax9O16A7FVQ+On03GQ9hQbOZvpIkufK2WabMbCuQiJeO5IOjffa2fOQCCF m1yqs/av0tIaTmirj5L5MwhB0EQeeNgiUqBktz8O8X9DkGqyRMwQJY4VyAwSnoUMG2ra 2EZJpb4A9pOisCxQFol1c7qzAUKrQDiFAPRLtgzp1Rw0pzlyMtQVibxaw1vFARLtyNZW VnrPHYygdd8JkNn/DzyT/BVIdFmVn//bMwZx49NtagtcPWdzjL09S3aPjCwH2ZacH/vO tgxQ== 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=dJVfEILLMVloq7Kmh7tz1YMBHvC6fLtHso52A4Yiz48RJpgHucH8dvHKT+VeBkduXd xHHbHL/n0hxbm9ve7rCZbnpXiyW4f+uwe/uyHb5S8U72ThZKLlZ9FKnRx8YLt/avyHky WMVvUzkCyTamgGoc81bFzEE4oXys33ee9mZLjZJ/yS1hI6E0a0xviZur93DNHgX03q64 ZWnS7FWdTAFb2djr0ygNbGqJ5hIQvnSg4T6C26rtcX0bKZRLzyBgNsn00zCy/i8l0qJ/ BTnyxUklg9i4nIXMok1crLsfO71FtajoMwCYU8udSX4WkOSMUzB/xjnu030Bo3+mWfwk HtZA== X-Gm-Message-State: AOAM532QkssvvcHw0Ll9epFYO3SaKGRwfSTeioSk0kB69SBv+Da1EACM iP/834cI9sdURzLc8ZZycgkxdgftziA22Q== X-Google-Smtp-Source: ABdhPJyLajq00fq4SiWax0RoSvJ4cPKWTi46P+Q3jfmt3HOnY0CLer3PcGcmVFSdCu+cGGTtkLvkvw== X-Received: by 2002:adf:f683:: with SMTP id v3mr42121676wrp.133.1620797848939; Tue, 11 May 2021 22:37:28 -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 z7sm28923720wrl.11.2021.05.11.22.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] gitlab-ci: Adapt JOBS variable for FreeBSD runners Date: Wed, 12 May 2021 07:37:10 +0200 Message-Id: <20210512053714.3268162-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.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é --- .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 12 05:37:11 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: 1477428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=M8UUXINn; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3WG6XbGz9sWQ for ; Wed, 12 May 2021 15:39:06 +1000 (AEST) Received: from localhost ([::1]:51042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghaK-0001m4-EK for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:39:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghYw-0001gJ-PO for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:38 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghYt-0006cQ-FS for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:38 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h4so22266980wrt.12 for ; Tue, 11 May 2021 22:37:35 -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=M8UUXINnr+w2OfdSj/ScgU1L0ekUMRACEMPrdrrku0Fc57O85u0YhJsiCTBqL167Th Qv6w3b/Tgc5akRc9ksBk6XFHFnPxXTUVdmER9VOFHTvcWkt7kgUYM0EgjRrd1r0Tjrop sT9Ps20jjV5PkdJkEGH73SQrxx/J3g/FqZP1+0BCyzO/3qI/8mg9JkVbmW0grEv6MuaC 0YY8JJrVsHHuD5IqqWuMnjS/CvVKAxT2Aj9pArw7ND3WxEiAkNdCBGrrLMQcDTRulvKr cUz9+Fng+7wlIaWW9SSM9UycyHa/NDIxeCOtZUHHwHOtECCpT+QxQVExy9k0PDnU88fg Brdw== 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=rqPltcsHbHNxYPD6QYKTQvGgrubXmufRutcogH4kP+RREHoGsHBFzHfYQ7mgYLZKP6 FdSUKY/VsMD9P+eRulXS3qdF/yub9m6LfuJeEbN7IvX2s51HOD73Gchv26ysQ5v3stip 79gJmGzVgzewY3ZE3AR41LERjf1k+5jiQsCp0nAShdjQtoCEFjDK7dYW1TMnYhyRySdp IpCaW0kQnRr2DZIT8fC4MRziFxXngzudvc49yxlr3oxNnLA0yZn/1X/Gg8/Ls3eMqDZe /P9LsqMDbXzGzFijY+x4wgTZiQdTGjPFQPpmvanXMwwrpznlx9KlkfKL2Yv3rX2gwY2o O2Ew== X-Gm-Message-State: AOAM530RCjPXYQTVs6DIjSEbVGl5HUy3toKRFtJx8I1+D28tXHDI+v2V Rd35DBdLzVDHzcMJOAa1ZiNs/atopYdGbw== X-Google-Smtp-Source: ABdhPJyQSLztzuuImWrlxzMNxHEXSVN9Nu24cIrPcnTu1jluQscApud8ZbaMPtdvrihFFpaN4t2S5w== X-Received: by 2002:a05:6000:1866:: with SMTP id d6mr43087935wri.141.1620797853782; Tue, 11 May 2021 22:37:33 -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 n12sm23549283wmq.29.2021.05.11.22.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] gitlab-ci: Run GNU make via the $MAKE variable Date: Wed, 12 May 2021 07:37:11 +0200 Message-Id: <20210512053714.3268162-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.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é --- .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 12 05:37:12 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: 1477431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=d7u11Na1; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3Z83FJxz9sWQ for ; Wed, 12 May 2021 15:41:36 +1000 (AEST) Received: from localhost ([::1]:59592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghck-0007b7-BU for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:41:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghZ0-0001ts-04 for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:42 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:37871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghYy-0006fZ-FO for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:41 -0400 Received: by mail-wr1-x42c.google.com with SMTP id q5so2823176wrs.4 for ; Tue, 11 May 2021 22:37:40 -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=d7u11Na1oZtz3d4gKsFXMxZABKeQIIL8x4dFAJu6Q65fmPXWzLzLYOTz8jMA+Oy1AL rvlW4L4B0HDq119hEzWFcA4upNAY2NjGV6WKCc1jr5a+wL7YxUuZPmuzgmiI5saAbsCy foWVkNBP9XbKCkZc1pOTUm4mfH2JxNui3a/4+wFHPM6irDw7ch/i/19MrWpvlNEDH/ZE gKO/ZraB6dHeV617hPyCv8fPJSikataNaBWCYaL2DEhS0YhSNPWQNa1jW8ht/xqP12dj +ghR7/0TBuzmv/EEuEhJ76ee/ZFFxhbmDj0JI/vCT+oQiRLTc/lldUb3OtEsZbLPOXSc ql7g== 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=njEsckH6iKZ9DD5NW7tWDtFO0iOAlcrnD29y5BihRz/TQEWEMvZqzTY1aJYHxm7si+ 5y7BTB7HpnU5Cx1st0IVxZPqPTNY/iAeFaN0XlhhSF/KBP0g9yW99drR/IjctALqZaUv DNl9oH1+oNw9ukOG6frnXVyeJ1414qo0eJeGGyg9YOJMB6QfdrN6xZPo/AmTDcA3fmhr FQflRt9dVl5Et8i/n8DiWFgAwwsxjiHWhT1HXszUUk+5guTW7iPgAXyD6FD0WNQ6BMjZ J6qrQfg2fo/ZgLvQu2lcY6GulFffUanrjGgb/D/h5JvrrulD+GazW8hKnVyWrQ9Yu22c CFYw== X-Gm-Message-State: AOAM532FF0/aSdp7HAAaBQcXJXGMfLdwxu7lOfOPEXLoPt98eREuzur8 khuKM6x/wCraXEQBS/nXYf4eEFTJB3gw/g== X-Google-Smtp-Source: ABdhPJzBWZOeOFHeHCEtKZzEF4C4tQGRWZEUWvlKd/KU92J/vIXIYrw82n57rsVSBrE9Aj8QshOwVg== X-Received: by 2002:a05:6000:1152:: with SMTP id d18mr42321180wrx.211.1620797858849; Tue, 11 May 2021 22:37:38 -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 f25sm29893961wrd.67.2021.05.11.22.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/6] gitlab-ci: Add ccache in $PATH and display statistics Date: Wed, 12 May 2021 07:37:12 +0200 Message-Id: <20210512053714.3268162-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.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é --- .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 12 05:37:13 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: 1477429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rzXnf0rT; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3YM56tKz9sWQ for ; Wed, 12 May 2021 15:40:55 +1000 (AEST) Received: from localhost ([::1]:57178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghc5-0005tq-EC for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:40:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghZ5-00025w-9R for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:48 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghZ3-0006iw-Ih for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:46 -0400 Received: by mail-wr1-x42f.google.com with SMTP id e7so3751926wrc.11 for ; Tue, 11 May 2021 22:37:45 -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=rzXnf0rTNzwh9xCCcC1GHTOTgwx/mlrXWoTAXJK3qe9pYBDXg7whQHHhoMK4cz4Eyz U33fuMAeGzSYi/WN7cLNGgqBunpRU5blkV9ggwcOmg5S+zYmGFpo/b3X5j10pjtOWxLS EmTGXSuybBN8lyc3pkikS0GAGWAt1oa3z1EAg8qWxvM79sZiOjanfJFmR7Lvft36GXGT TbwvruRzdSCMJ5v7Z/BdlzwgEoqMaIs/VrxGlkJwD/uxxQujkZlqXAhDPYMAipnUp6lO Kyz0ml0zoaeGCNN6gOIJUnCdoHaPcuyWKScKR70J5dI4arqdn3JtDsF10RHCg2W9IjHK yEkQ== 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=iVAenHwEhI+zDpXTGKTQSSTtGXZfR1d8nQCe0u9WWMUMj/Rr2U8kjM/slKKD0cACMH CdI67W6Vqe1/QB7zrpzPatJE+NJWCPiuZvJhnZowzdG0s1adoTDfaUdfoCF6OpfdRroY IXvL56wbmkhqNg3MWFguAJ6xNgXkrrzr1FQiP0BxLZOF4zVdwZ5NLNFPJTTWbNnyoLm4 4lu+C7ambKCyfxlO+syqN7f82qp0JWf0TXTG9iB9hpqSX1/+JI8sAAUTP0fmVBzNWEZa hg93B9vuIg2ek1yECgZ8RbMB9XcwpGR+FBLo2yvTWFyFUfAFnzJDh4V8AH2WbfSkw5DE 9RaQ== X-Gm-Message-State: AOAM533iAhJjDFM9Ik/CiigXah449ob6JWsyudWU6dRmOiJeIZhu17Rq 50M3Ntl8rJYph3Qj3ey9Uw4AnkhJcCG17Q== X-Google-Smtp-Source: ABdhPJw9UMAu3ERUhUZ2JepIGpKR3KsFpeMKsLMIfyUnrE5204J7x8jHm4xt0ZiTvV5WJr06WSuDeA== X-Received: by 2002:a5d:5186:: with SMTP id k6mr43184800wrv.335.1620797864114; Tue, 11 May 2021 22:37:44 -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 g8sm197890wmp.40.2021.05.11.22.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/6] gitlab-ci: Simplify before/after script for Avocado based jobs Date: Wed, 12 May 2021 07:37:13 +0200 Message-Id: <20210512053714.3268162-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- .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 12 05:37:14 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: 1477430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BfLJF1J9; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fg3YY69ybz9sWQ for ; Wed, 12 May 2021 15:41:05 +1000 (AEST) Received: from localhost ([::1]:57982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lghcF-0006Rv-MJ for incoming@patchwork.ozlabs.org; Wed, 12 May 2021 01:41:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lghZA-00026v-KC for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:54 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:46641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lghZ8-0006mF-V2 for qemu-devel@nongnu.org; Wed, 12 May 2021 01:37:52 -0400 Received: by mail-wm1-x32d.google.com with SMTP id p14-20020a05600c358eb029015c01f207d7so2358507wmq.5 for ; Tue, 11 May 2021 22:37:50 -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=h2VdBYXj2r7JhlOGwI/fnubAf5eKc/fp9EiRl43x/fg=; b=BfLJF1J9odSFulzQ18Eya8AAMw55QCfCn61Mk8I/mSvubKG+A57FjfOD+SxUIThvJ7 qsCChxcMZIbSyYpejncRkMT97dibdJJ2WHzS5j3iF6uKiFZ7z0RNMMiC3ki8EfF2csgq 1wuAX+9YwcDMsYRWRfvfdiKH6hxu87Kj4RSyKK8w84n1MyqfF8wwFI26ay+ZUNIzUpJn gZkghppihav696JSYb70IYWcWs1ly49m1tcSWkBRQidCBQGUX1kZD+Sg3bLSjqqMKP5g 6oKmmdQsx6MkdOhuthmx5QgXdcnouXoMtQFIjONiRpBCcKbzTSOTWkoW9pWj4Hir3+Aj 97Zg== 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=h2VdBYXj2r7JhlOGwI/fnubAf5eKc/fp9EiRl43x/fg=; b=JRBZmVbXcRWKvp4uUWWJ5WOCODiBZkUDY5c4m7cnH8+wQCDE1IgnAkah91v6QC36UT PXYiVYezwSx/Sv8sulgItbf9kwAK7E5QXwVwULPy2sLuL6RfmsvEBA6NDpOhvfFIjlYn n65yjSpoVYYkrUEgsoF8MYbdowRLto5hfGFssPmmMX7z9U3H74aCh77po8YcnMzlftif C8t+0oJF8hA4/Q+C+tY2W81EDuxbHYlJKqupYBCMzq8yIQRZyhY/AGo60bEjSWITU2to jDUNQV3GFriar9GKX+RykCtJEhZb1GghWclEKxvR8YMhhrnqpU/oQd0SxxJHvtUPneYp KC3g== X-Gm-Message-State: AOAM533RazC1CzEO46QvlxZUR1tIYaTevu9b+1T6Q3i3+TenzfB+su3C bXaFg6ndNdj7Z1V/PmuFm8Ta3RdgKlnOVw== X-Google-Smtp-Source: ABdhPJwtYPWfY0lOhFM8xEpOcKk/sBWpun9sbZ9GFBm2+Gxmp0+b1KHcHCZ0uwq9jx9k35TLjbgeqA== X-Received: by 2002:a7b:cc15:: with SMTP id f21mr9551118wmh.86.1620797869224; Tue, 11 May 2021 22:37:49 -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 x16sm3400869wrp.6.2021.05.11.22.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 22:37:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] gitlab-ci: Add FreeBSD jobs Date: Wed, 12 May 2021 07:37:14 +0200 Message-Id: <20210512053714.3268162-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210512053714.3268162-1-f4bug@amsat.org> References: <20210512053714.3268162-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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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+incoming=patchwork.ozlabs.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. Signed-off-by: Philippe Mathieu-Daudé --- .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..683e815afbf --- /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 thss 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'