From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449958; cv=none; d=zohomail.com; s=zohoarc; b=CsDeNvAQDlOswRaMS2KICB//Uw/W2bXfPP9qjcUIWghAsruosU15Z+Ia9A9NyYox2I9z2OXJ3nINDfKoVFH90pYjjXJ8pqHEuLWJcMlbWekTTBqORQIFrAlCUxNLotCQkk3uA0N5j1zzscebp0yr9wAtpWTvpxXDQSP5rsd13pU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449958; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bp3Jtw7C12/rHMWvD6mwBuDijE8hJ1LIDyBcdtavfR0=; b=UeI8z4psW1755zjo9bq3meBZChZbfnRvKb69WMmrI5k+vk5N0nat5oybNZ1pWbE/hDLnNNFrt+OndtgKx2oq/514Z5lyBojCw6btwLywZVcxiCfxbj6+2Ii9HBTGfshIt2BvQakmb7XbgteT1nVI5RK9Xga+EWJo0nIzqy3y2Os= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 162144995836122.589746446152958; Wed, 19 May 2021 11:45:58 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id x8so15069798wrq.9 for ; Wed, 19 May 2021 11:45:57 -0700 (PDT) Return-Path: Return-Path: 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) 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=pb4zecBtVnj6aHt/teH/R3VbtwZ+RuzEwrldaxrUiVZZDOeFbJNhvjmlENSsAkndy6 TyE0fmNLUZS+kr4PKhZFiTd0rNsfmQpKXDI6HkhfMKdYibC0v15bAG8I4sHMY8r8gcIJ cRuD38uZBQA3Y+CvydErnPJc6/U5WEUwOZBzd1L/5D/1aLLs9VtD/eYXCIjha0DkWZjE wRjC7pxUlwS2qCwZGlfBaZ2+DHFONXBBD5U4nwhJ3MNGOEHXSDxUCh57a8BQUzK5kBAV hXc0g/CqcHsvY/xFFF2RhSG/PQANx4TNq9yxwEhvA/49SWfKYvNvE4mdx5RozJ032gMt ZElQ== X-Gm-Message-State: AOAM5301v3zSELA46rwEmbGzlFK0aUHSJF38CzC2hfmgHa206ixOZp/h z989JAnlanpMOshC1SVwvEQ= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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-t= emplate.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=3D$(expr $(nproc) + 1) + .native_build_job_template: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - before_script: - - JOBS=3D$(expr $(nproc) + 1) + extends: .environment_variables_template script: - if test -n "$LD_JOBS"; then --=20 2.26.3 From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449963; cv=none; d=zohomail.com; s=zohoarc; b=Ktpp/qNYCcRnU4hmURjFPEDscxgtPDXDs+1VfIJ79xhhTrn7ts+HwB1vqS8I5fC2LIjDZgKg/5eKCz8o8QgmGHSRhQ5XkKCofhWCdNf4FMIMTNqdvS8u/1egntIyCdXBJnkmszvzVhINxmtWQWP+673E4BgmXQDYdCRIt9Fi61I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449963; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uOMO62Q92IuNdNSfONgd4MnSVajL3jCH8wZPtpwgeBk=; b=Tes0DmxmF1fw5BRHdJmwyCWuo5gPlSE2L87kHUrbNz3gshcqrIb4/F7seoR/QjLlj/ui8Q5bfKzDHF6mDgYqDWQdiBnxevghePySozW4ERnVZYMpqgZc7OAd8zmyyQg4XLzHOhUKEQJcBPiDXI1Q/tIsOWXfu+Xhpm2N6xB02E8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1621449963192787.7893279669862; Wed, 19 May 2021 11:46:03 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id v12so15072237wrq.6 for ; Wed, 19 May 2021 11:46:02 -0700 (PDT) Return-Path: Return-Path: 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) 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=shJVmcFXLk0pAJ/VDo1rUburBKxaKIUVIEKdwMGv4pnwSzz+zmnonft311EVJkwOtU AR/Xtm0UEnPpullhfKTnRMJfst8U/oQ5QAcmcqBD9u0hyzJLmIlsX4zY1s00oUO1kPeK ytqJnMYRXWPuy/ltJ4IpEMskPg3T8mKVkRVM/lQoUkRlp76R4Wh36EWSYSc4ulGA73Pe QBdvxiFGZHF9rQu717N3p5ngRzHAU8ksxkBl/Ugp9IZcVGD9/KX9+aNHxU/6FG9ZWlKO no17WYSxM2aO6TK/7XeaJr2AykZykCFciv9RktkfW/C6R1O7HOZ7xpnhnJAvYK2xbKSa uCrA== X-Gm-Message-State: AOAM532LkwrZvRmSdNqSS94/UqsydWiLmX1No0+3igPp8o7Wfwh+Hi1v 5tbX9lw3hznP0XDHpZDpmCQ= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 'nproc' is not available on FreeBSD: $ JOBS=3D$(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=C3=A9 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-t= emplate.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=3D$(expr $(nproc) + 1) + - if + test $(uname) =3D "FreeBSD" + ; + then + JOBS=3D$(sysctl -n hw.ncpu) + ; + else + JOBS=3D$(expr $(nproc) + 1) + ; + fi + - echo "=3D=3D=3D Using $JOBS simultaneous jobs =3D=3D=3D" =20 .native_build_job_template: stage: build --=20 2.26.3 From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449968; cv=none; d=zohomail.com; s=zohoarc; b=bli9V6BD5St4OzF21QgJbrtjappJdsSxN9JkVUPdGBkKxua2gyeorupOlGfii1tNy9I83Z9QsW5T194w9sH+lHfNrn3IxU17Qmq7ZYll96fNu3NvXfQU98+hV+VJF6YZsTb5adYcj27HJbqom5aenTw9gMRpyXKi8bxZ+wfGM98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449968; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bxIn0INwdcSb5lb9f8fZG1avNfdlG4L8wrUYhmTwTc0=; b=AIS7coYyCXuLP4Wq0lCutZa/FCChME+yaD/bPXGYOuTVA8gosq0F86kwmTO1pnmkyx+Z5c2eigPfdY4xDgjlsm3YseBG1pHyVF8CklFo3mU5G23Rm1NQJ+rGbJKGy/+zNTARqOhIvNJ6n/ZxqqAzTDMq4BQzzJiPT3PQeZ6zWYA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 16214499681221017.672708156718; Wed, 19 May 2021 11:46:08 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id c14so13292121wrx.3 for ; Wed, 19 May 2021 11:46:07 -0700 (PDT) Return-Path: Return-Path: 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) 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=VuFgsZxfPQ7Iiv5SozFDidqimdRsG2vbrOCwuT8xiwIGYUBAabwQZdvM74vfnw+siq 0ay+nPofj4tHYz/rlDOt4NiEkpARiMv6FC21HojEFc8Sx2Fe2EH1Wx9ef3hU/+Tghk5a juKFo4hY80XgMdsxkLDExDCGODZviUO35knORs4vAmVqUYsYq+IYpJt8pmgD74q7IjNG 5TLOF5wIi2uptBGSl9NY52rcfzUxKyryj6yu2KG0LPPS71kf8z4EluyfkWBY/j7RRY5o bryaU2WeN87/gyWiNragj9247cb9PdszVdG28AzqaVcl9IYJw2Tz5HXKakFtQOnOGFV+ 2hSw== X-Gm-Message-State: AOAM5319fUG/wQJYZMiDWbJGVbUQzAZb11scRnmZ+VGJByN9K6D+1djI 5LBBJLlhWL8HOnrrs8qjCMk= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo --- .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-t= emplate.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=3D$(sysctl -n hw.ncpu) + MAKE=3Dgmake ; else JOBS=3D$(expr $(nproc) + 1) + MAKE=3Dmake ; fi - echo "=3D=3D=3D Using $JOBS simultaneous jobs =3D=3D=3D" @@ -33,22 +35,23 @@ then ../meson/meson.py configure . -Dbackend_max_links=3D"$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 =20 .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=3D/ s/.*=3D// p' build/config-host.mak) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=3D":" - - make NINJA=3D":" $MAKE_CHECK_ARGS + - $MAKE NINJA=3D":" $MAKE_CHECK_ARGS =20 .integration_test_job_template: extends: .native_test_job_template --=20 2.26.3 From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449973; cv=none; d=zohomail.com; s=zohoarc; b=OzSz8EBxMeiCjwCoaxkYMMAAQy62T1s3LQOtA9x5HQHTn2IJ758WGFh8A0zSH/oPo6LpkcKou2+bMKyKcvkJqHPlzCurCPIR3MGa5n71wz9rVWmxnpmBzlHEeYtzm4p4+bKj7vAMfEJJ/dPChl9X5lRREm8Z9dttE/K1z+4iEFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2IUveWwI0J+7Ncapudv20RtB39QJD/A5pUhEcIazkKo=; b=DHdvs8Qpd9enLbh7U/tKvRZJDkGxpBi7F6phIXNRQ35mPUByC2BxrunuVJoQ8CFBaFFsguUB3yBcr69bfZUra35jYxcDDu1EuN04OUKKxBMexPotc86sDV6IWF8coLVhRWbHJm7lmpInrFW6aF+FL7GKF4sqpnm/BvDZo66AbYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1621449973057904.384134362435; Wed, 19 May 2021 11:46:13 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id a4so15116880wrr.2 for ; Wed, 19 May 2021 11:46:12 -0700 (PDT) Return-Path: Return-Path: 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) 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=OkJ63tFCa28Qbc5wy3lQV1JpkV33U32LfFA8ddSeQydoV15vWzTafqs2YKXNJ0MVnN unQ22O8tTtDkTfRZO+u3CAvW5jO197x8qp+90iMfBzw/+qHEzFqhmYy/ef7mZno93Pkn 4A2heeXH0joBMc5LXYxhU4VEA4pFMjQeGwJ4YfUmjtKbBPMkKUO1tpopCr/x/ZLNuh5j EKhrAjXFEaUGZxMr5VNribYhA3njqLA1KLb4jsoqSxrllm2WM//tbhy6BZEBJ2wyi50L eT8foZRXYaOXJzl5sOXm+CwMkjEHnpQA+zS2EbNnUJf0P8bgdNeWmWtYEUVo58N9oekm +Y+g== X-Gm-Message-State: AOAM531X8DgtxL8Yj/S/K98BqUzpR42NKbsdYDcn2841eCpP/7CZfWTF sf4uOSFHfCE0DZkZYLBYvOs= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) If a runner has ccache installed, use it and display statistics at the end of the build. Signed-off-by: Philippe Mathieu-Daud=C3=A9 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-t= emplate.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=3D$(sysctl -n hw.ncpu) MAKE=3Dgmake + PATH=3D/usr/local/libexec/ccache:$PATH ; else JOBS=3D$(expr $(nproc) + 1) MAKE=3Dmake + PATH=3D/usr/lib/ccache:/usr/lib64/ccache:$PATH ; fi - echo "=3D=3D=3D Using $JOBS simultaneous jobs =3D=3D=3D" + - if command -v ccache > /dev/null ; then ccache --zero-stats ; fi + after_script: + - if command -v ccache > /dev/null ; then ccache --show-stats ; fi =20 .native_build_job_template: stage: build --=20 2.26.3 From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449978; cv=none; d=zohomail.com; s=zohoarc; b=aWn4tdi4kCuCnp1ElQfVZcWzNcD0bDkdlJwR6uDJNzHiVF7RZIUOt7wZCMX5Pi2rabYueQyneNkgQ0OUkW0v/5teKz6Ay4tt711K6mZeLeemwPBlS1iryaHdzA4PxsQ3+W5FqArKb+o0C42VLJzYF5DcgXSga6Wu5kygURYKbVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449978; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3SkTTNfbgrgPZRsbTajuJ3tzgEyu0ZeYqUT1Kjom0eE=; b=B+gflrxDkVh+AIfROJSgSEcZWiQCKUynzqH6RZa1S44kuKwaGVRbXGnTnwWKKixCdjeKKaNO2NFauEhFF8Zwf75HScLkuJwxG8AhlcxVnxJ7WuePydN206RrO1hBLY1ApA9Ma95gu44LeHViVENCor5Ubh/fYzj7/iZRHTayBq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 162144997811223.644931096418986; Wed, 19 May 2021 11:46:18 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id q5so15072896wrs.4 for ; Wed, 19 May 2021 11:46:17 -0700 (PDT) Return-Path: Return-Path: 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) 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=F8I1MVtoFuwWXblU39k45FcQGSRieHO6RcidCPFgjjBh4oN2zmzjKKpqIB8LR7KXDS ydcPr6SUHg08QPU3K74Fr3MRWFf+3CjI/o5D2HZq2g5/WNitc8KewUdeYDtClGpinyOq CmEcJsBnKnBnfDgO22qmMz+Ny3QwJemIM1XhB1S9x87A6FumU9qaXCjKwwm7IBK71qXm RtIt5gU5W27WTj0ORG4XM2JQDzqCPCAzybzEZEoAELWSVcZJH+ZWDSGRNt+uHiPdcI2z v/i8BieRd8M1V5kHMnIHHAIDonQTu3a/s/YwDCQ8a/Jnp7tgRRNI9x39r5/r88NO33lI TsBg== X-Gm-Message-State: AOAM5332YW/nK+/WH8a5RLHkTceZeqM4If2+HHA9E2uMdlcnpuJJfdEk wycyryw1tSCjlBGRpRW+lBM= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 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-t= emplate.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 =3D ['${CI_PROJECT_DIR}/avocado-cache']" @@ -85,6 +85,9 @@ du -chs ${CI_PROJECT_DIR}/avocado-cache ; fi - export AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 - after_script: - cd build + - find . -type f -exec touch {} + + # Avoid recompiling by hiding ninja with NINJA=3D":" + - $MAKE NINJA=3D":" $MAKE_CHECK_ARGS + after_script: - du -chs ${CI_PROJECT_DIR}/avocado-cache --=20 2.26.3 From nobody Tue May 14 17:17:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621449983; cv=none; d=zohomail.com; s=zohoarc; b=Fe7yLm5GHL0cXeYSLOd1dE/xSGsqZocrsU1RAum3ZISbSzdLoI2Ep0efk7A7kVVqvS3LtbjyT/w5iu/mRI8nEydixIk2A2n7j2gILQd7atiLly0nm870DzLWVhdNNEkECRsJeCTdB4+XggzLqBz+nUCLs2LzCPLx+Ss3Sy1UGY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621449983; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tgSX/LGDpg9kR/VLumzVDItz5dEMkMShrSHH51Rq6pY=; b=EwFubwD7yt9kAkDkeNuT9szxXh3cAMpPJpsXKS8HkcAjJa9I6nHJ8KpVvDYO/bKejeedz8MoUDbLuOdd/sL74ijQzOklNgi0ogizT6yiO1oBetZxmoQ8uHPgIExbyrLUJFd2LrklJ1j9h/L27fJdp40xbBQ/1bQvvoA45rVgUJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1621449983115554.139348884149; Wed, 19 May 2021 11:46:23 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id j14so13337122wrq.5 for ; Wed, 19 May 2021 11:46:22 -0700 (PDT) Return-Path: Return-Path: 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) 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=am4hqrQOXNQ0exnq81USOAE73JAjNfbFX//EKpbW4NjlEn8U8rOK5k3ut29zNOVwMD FMucMRVKntxMxBSrVx/tBYClKTeQ06M2//1IEhJ5guxo0ohh6BdRiICLmuidBkyQLBnV JeP8MkbWkKEH7O9o9A0xoJdfyv5iECnvYtrzuN6hGJg/YOj6AviwCw4d5pS3EcgmUv2C N/ESp/O3890xeY//rQ0CgmUB7M3CjcA7ZHww4Zdbadfb/aKGqyEZWaCtdDYLngpCUl2Z KRmeDy59Ukte+pONjcxY4Ob8AZaNj/oiz1cUAGQi+/Qt+0788xjckO758lY87yBExPjN qmmA== X-Gm-Message-State: AOAM5305HbYZyp1QLYQAJJp++AnbKRzk6PhQG1wc1T4ZjrR2D153EY5u 8wg4fGjIsS2xkLf3EyNe3rw= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Kyle Evans 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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-fr= eebsd.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-var= iables + - if: $QEMU_CUSTOM_RUNNER =3D~ /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=3D/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=3Dlog,simple,syslog + --python=3D/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' --=20 2.26.3