From patchwork Tue Nov 16 16:25:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519204 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7367908imj; Tue, 16 Nov 2021 08:30:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcoLN5tbkgQ7r2pF36u4OszKNHtoHq2cE/NpvkzrXr1wyVVKLkg/xb34hCqYsmtwSC0ZV3 X-Received: by 2002:ad4:4246:: with SMTP id l6mr46737524qvq.65.1637080209951; Tue, 16 Nov 2021 08:30:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080209; cv=none; d=google.com; s=arc-20160816; b=q0r9UNfm5j+Y50+3ITFi4TuuDl08R3vJTKJaCgnf8AoEm/rxIhAjnqnyUUXCWuY79Q PLqq9m6F9ggzDn+0+FR5wllsm/CLFBuiA/qbPDP+UVJBHP/HyndqQ2SYTAuT6+z9OEG7 AyFLCkgNSLQ/lFxkVtoRF4+q/4MrtQX5ii/kBGTbh2d31YjGPFE9c/wxFkKmHBzRAJ3+ Sx2jJQNh2rpKMvqdiUmy85RY224L/0EWbVgY3jH3OJuQ5B9NAQqFjgpr6Ig5dMN2jxM4 J5KEwt/N4AxTaa8sgC7WmaWgFG6SXM1uYwPl0t0WNc5vIlSap+hXHvu+otcBADX55YcD /dFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OFTQIJHmHLwhfupY0wZqpFqclRFbQp8X+erMaavnLPE=; b=q5/Auw9pLXpj9hnw5WQl1iTgp6rdXU7u6wvCZE+tJZQvrZzszWVgmyyr2ckLm39fJI 8wgUrX4RUEDLQoHJjbQW67NQmOpRdSsktILplSDf3hAU3J2IxtLDwOGn1ZWsZbi7D5MB SsAn4oFcM0irORyB6PDBsaH4PNSOCtGtzsXG/KqBZFOs9q7rUVQy8OOjz/n99hoBDJdf Jeu4L0H5wOD4uk28zITLFcC8imnDVlLwTInurbQ4BTBOEfveTHdLHck6UeH0WS7eTjvW Mn4j3wok/ZOR7/rBt4VDlVH6uAjWXz0qgxiQLX/GrJ9HlDjFsUhmsBrD/WOCsECbDQq5 aDRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qTbSq95S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v17si27148688qtw.358.2021.11.16.08.30.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:30:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qTbSq95S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1LV-0001nc-Dy for patch@linaro.org; Tue, 16 Nov 2021 11:30:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gr-0004TM-Pu for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:21 -0500 Received: from [2a00:1450:4864:20::42d] (port=40578 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gp-0004Bn-US for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:21 -0500 Received: by mail-wr1-x42d.google.com with SMTP id r8so38620424wra.7 for ; Tue, 16 Nov 2021 08:25:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OFTQIJHmHLwhfupY0wZqpFqclRFbQp8X+erMaavnLPE=; b=qTbSq95Si4Vp90sc3zO4JVcirSDM2SZTdOLysEWG+Vt7XBgrhGwwFZL/nwQBQlC2OX JmTd7/d+EIpLwCpUIOkaw/rAU4EX1CAL13NWJQ8HhAPsA6Wazd68OhqGGfAy1WOPNRMK mK/Q7//Y8IyNtpAgpJDVSqDhAilKRT1iiCbIjfX+3Y29k9dRaqO+7EUkP/kw1y1YHZuh 28/XNi/QhZTU8dayz2A0OgKKaZ22nkRbqqPUZS+VMFC7VNpLZ1PBf1MAkEMWyEa4HpZP 8i/m2rG0KdGG8AoZDEiw8YLdLLH1DWK2SQLIseGmNPiAKgyjrI/tBGmyhBKpBQMSS0OF FOGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OFTQIJHmHLwhfupY0wZqpFqclRFbQp8X+erMaavnLPE=; b=0J3DDM56NzHQRBqrvxxkAwbQUv91sF4yJdU+y9goYfrQl8Xw2edST+63trZW7ODtP+ eWISQ2ZmytoU1ECPg4hsU4TRTqa+ydoAN1zQwXl1yqZ6FaSDb0VHQ563r+JFMQzMVanR dxqaNYLgEuJVcp/c1AwaInE0VUBEnUHnUDv6cO8FoyVKmkccXKM/Ka+TT4g5TOOMpIbV hegmaVMdsXJpyBznYud979rpnVRSx3kGq+Hf4hxyTryYwP61heTYwnrPboYV8x87qe8E dZJ9uvSeQZdhhJdVhhtenR2Wo4N14YvFjpPopiTW5rJXNUcSlQmnrGDl+zZH5xpaKLF4 39yw== X-Gm-Message-State: AOAM533isF4/V2TEFCW/Im7/i6A9Bgv7Qj5OfDjIGYv6OXMR8gqflukj de+PVf7GFuRnEunCPugjS47uMg== X-Received: by 2002:adf:fa0b:: with SMTP id m11mr10785454wrr.152.1637079917688; Tue, 16 Nov 2021 08:25:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g13sm2706061wmk.37.2021.11.16.08.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6BBD51FF98; Tue, 16 Nov 2021 16:25:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 1/7] tests/docker: force NOUSER=1 for base images Date: Tue, 16 Nov 2021 16:25:09 +0000 Message-Id: <20211116162515.4100231-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As base images are often used to build further images like toolchains ensure we don't add the local user by accident. The local user should only exist on local images and not anything that gets pushed up to the public registry. Reported-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211115142915.3797652-2-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7a63a3b7f7..f1a0c5db7a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -150,6 +150,9 @@ docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= +# base images should not add a local user +docker-image-debian10: NOUSER=1 +docker-image-debian11: NOUSER=1 # # The build rule for hexagon-cross is special in so far for most of From patchwork Tue Nov 16 16:25:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519202 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7363884imj; Tue, 16 Nov 2021 08:27:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxROZ3POWhJZw7ApdaPijfvAL57dtNgG04G0QKifP7eWUR27oMIXq2FBTSrnecRYy1FqKd0 X-Received: by 2002:a05:6122:2193:: with SMTP id j19mr76570698vkd.7.1637080033595; Tue, 16 Nov 2021 08:27:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080033; cv=none; d=google.com; s=arc-20160816; b=em6N2bSSdR07UW5Wdt6hwokFuHY9GTH1z+FGLQP2GE9fgzwqvTsqeBmehj/cbzi6Sp dq6vjf3hGGVnIM+sIPXZfXUqSICF3V207QoRuwX//uOjOJlEAAGSClyzyTLyzFF+M1yp pk1BPCdMpNIAP5/pecma+9Tipq4xYokuH4/+0TpBMWa7Ef5PFAH0suSE3lgUnAHbmOmf cjaV+hVTQno0AXuncvXW0DeyPoN51VjZ4yvDDq/Mmw0JVWTKmWOKtFFcZhh6Xqn+ZNmS XpPQXeXcrY+1kXOSuzgvva2ymgJY97aPqL76OX3ibhu390kOtEcCGcIy8MaKxom/aqvg ZUVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BeCqD5fBRQsbmQUc4BGJhRKARVguo98gcXnxc1pBgj8=; b=VdkiolBIp+u8k8d1FG9a1poDew55mvB0R0f++PevTQpxrhPAVP4p3+Ui51TQkPE6ye bS+aUhdXISpx8bpH/nWboG22LsC1JpSd01BJifzKCLPnySGagwDA0yGtVmjcqe9T2cuu +T0oQzrpcedvAlPMEhGnLz0cJSlZ9Xmmte5LRVbPX8CSDJvmBZprC3VYKNg4rnpIYocJ OMVaD2HoYKToJki52BV8Pr8xaAtHgmwrhooDQW2/uhqiZo+YRDTqbcW3ZkSm0hnSeWtH b/5MAdoFonOhxy3ZNlgYiHmjmMNd+tNiI00jdTIa+oyg2Ndn0FeRdaN6fdZohiWNKpAm cRkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zvYrBANb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f7si18282173uav.191.2021.11.16.08.27.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:27:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zvYrBANb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1If-0004bx-0I for patch@linaro.org; Tue, 16 Nov 2021 11:27:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gs-0004Vl-GF for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:22 -0500 Received: from [2a00:1450:4864:20::433] (port=36572 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gq-0004Bz-UC for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:22 -0500 Received: by mail-wr1-x433.google.com with SMTP id s13so38764120wrb.3 for ; Tue, 16 Nov 2021 08:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BeCqD5fBRQsbmQUc4BGJhRKARVguo98gcXnxc1pBgj8=; b=zvYrBANba+iHr/AqkbUpXITfhR0qKbd/89tgZrED+CIxhpSgEbIsAT8xxrgmxbNS9d yk71EtP41/I/b6t/28KbkwNdZEallOSOomgSWAdvEf+IEFOvGsRP/aYzy96jB1RLxyyo 8K73EeiXshxdBrtlSKmXbkEw0Qw92LrUTqaFGAkvE5idtWbc/Raa4LKGJ3FN4lHxLtBS cLwbkQxMAF8Stm14nbrCHoj0cmCbkLv5QEKCaE8Uuf8j43cWAqyXalOdf80CDXC/VN8+ hnasOGOwHFAtHq4wXSdURhq0HpxpBcPVR0toGS+GULxEixn9XjFztbEZ6StlmKzgmR8B 5CKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BeCqD5fBRQsbmQUc4BGJhRKARVguo98gcXnxc1pBgj8=; b=YOQmAIwDkT7ZHZ6BptWBzxaAi+cUOBDSdCkDmxHxG5Gj+F2OAg8CNLoJJfo2b0CEKX LvttJBKpJlsJEp4lM0xDLEyE0rRFGNL7y457ga335oJjl0kqlILkzyOQNVtWlrp+B0Qd uMtV7UfFjbfnNjmjiNCrK+PCIiiXz/++6DNSMc94LcqvCho+NLZ0gEs9S9sJ8Ij4+7G2 suBVZvDE9D8RrryS7ow5TxFP0mBKiyduxEFN+65o+m+2gvp/XlFRbfmwFnKuLaTSjRr0 uckeTt4DQ8p5K3Q1QJOhOB7DaMbFWQferVlURNFrOKK0dm5dFkGsWQ20zU+N2VJ9cm/8 S65g== X-Gm-Message-State: AOAM530gxKooPF/bPlgKgQBaH+tOm302aaG5kaiYp3SFFWCSfJCC8Jez vf5fmoqwSLIo3i2xJTYWnyAuTA== X-Received: by 2002:a5d:598c:: with SMTP id n12mr10701406wri.250.1637079919464; Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s13sm2945769wmc.47.2021.11.16.08.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 821641FF99; Tue, 16 Nov 2021 16:25:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 2/7] tests/vm: sort the special variable list Date: Tue, 16 Nov 2021 16:25:10 +0000 Message-Id: <20211116162515.4100231-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Making the list alphabetical makes it easier to find the config option you are looking for. Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20211115142915.3797652-3-alex.bennee@linaro.org> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index f3a3a1c751..f8ca619cf2 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -52,21 +52,21 @@ endif @echo @echo "Special variables:" @echo " BUILD_TARGET=foo - Override the build target" - @echo " TARGET_LIST=a,b,c - Override target list in builds" - @echo ' EXTRA_CONFIGURE_OPTS="..."' - @echo " J=[0..9]* - Override the -jN parameter for make commands" @echo " DEBUG=1 - Enable verbose output on host and interactive debugging" + @echo ' EXTRA_CONFIGURE_OPTS="..." - Pass to configure step' + @echo " J=[0..9]* - Override the -jN parameter for make commands" @echo " LOG_CONSOLE=1 - Log console to file in: ~/.cache/qemu-vm " - @echo " V=1 - Enable verbose ouput on host and guest commands" - @echo " QEMU_LOCAL=1 - Use QEMU binary local to this build." @echo " QEMU=/path/to/qemu - Change path to QEMU binary" - @echo " QEMU_IMG=/path/to/qemu-img - Change path to qemu-img tool" ifeq ($(HAVE_PYTHON_YAML),yes) @echo " QEMU_CONFIG=/path/conf.yml - Change path to VM configuration .yml file." else @echo " (install python3-yaml to enable support for yaml file to configure a VM.)" endif @echo " See conf_example_*.yml for file format details." + @echo " QEMU_IMG=/path/to/qemu-img - Change path to qemu-img tool" + @echo " QEMU_LOCAL=1 - Use QEMU binary local to this build." + @echo " TARGET_LIST=a,b,c - Override target list in builds" + @echo " V=1 - Enable verbose ouput on host and guest commands" vm-build-all: $(addprefix vm-build-, $(IMAGES)) From patchwork Tue Nov 16 16:25:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519205 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7367955imj; Tue, 16 Nov 2021 08:30:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzas4qgkCPiSqsx4t2flcMv3/aP8izsT+1s3SayK5WNFuc0WIhEpBriBVuev8j2PRqXMMuJ X-Received: by 2002:a05:620a:1294:: with SMTP id w20mr7554250qki.197.1637080211815; Tue, 16 Nov 2021 08:30:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080211; cv=none; d=google.com; s=arc-20160816; b=zqZtO5TkP/5yvtse86UR1ISIsZhq4uk6WQaojmhVj5i/u3JwKQQCt15krlGz1XILj1 eV6JjcYcvgGVhdTnSt7d4/tq63Wgym05T/vCZmnhdN287R0nakU/2O3hQQplJsPzeSDM oyIBVuewOIhnD3pLdCU6AG/aEKkdrjckENB670x0t7FetO9hlY/fwy746DmK3Z4lg/30 8euuBEd8OAKohJ7vrdATzs3Xg//NXlXwDShNW+i7ASqtd3SZbSu/3TeDT9vRMSLAzD0W C/hl+O8vLYSo6eth2AkZiD03J6tH517URf7941V4PToqBsSqN25Ilum1Z68vn6rEazXH SS3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hp+3+9AUZf48hagv9aooEUSQ5CMyks7M2uw5VJWYugU=; b=PQz82Y5pZkNQsacYRvUkDDr9NFsdB+JHORZENYEP9HjowXSnMn0llGurYlGL6HJ58P iEffZJMitPWfL8ZdorB4UdrlNQMx2sMs42KqclMWFXaxpYwUfuyGPq+QLTTcj+GNG9bz hB5/hG6sWOwXD8ebcM5G0MJy6X+Nw7tTyKSwQLm3KpBL40BjqwZM9cnQ8jxCOdn83vXF p2hciwmM+L7lZo+j0HcjwrB5vm31J5rFDHetkV8jyOYvGyfMb4ZndNcp56EYrtD2Q4aZ 7ZeqxQ+2ekPsHCANSpZd+dbJyGoVcI1SuMZ1Y9q4SE2LjHEeTcKcSQaM6tunYIzRQlig o1iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gWtyV0vD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l8si14894628qtk.351.2021.11.16.08.30.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:30:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gWtyV0vD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1LX-0001lo-8q for patch@linaro.org; Tue, 16 Nov 2021 11:30:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gu-0004Zl-6W for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:24 -0500 Received: from [2a00:1450:4864:20::336] (port=37724 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gs-0004CJ-H2 for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:23 -0500 Received: by mail-wm1-x336.google.com with SMTP id k37-20020a05600c1ca500b00330cb84834fso2466195wms.2 for ; Tue, 16 Nov 2021 08:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hp+3+9AUZf48hagv9aooEUSQ5CMyks7M2uw5VJWYugU=; b=gWtyV0vDYq0MArlCyWINj5Fvf5hBiw9DdW/uHF7PCyhhz3DbRVKX5kbR9yK3VU1Pwl DNN4nEI9CscKYVg0/+K45wxEGeOPhvzMma6Nm2dbv/MCRBRl0iw+7PR96Qyi3IT1ezYm 83phF0V7A270RLemr7y0VmK9z4P3Fr+qh6Eij4M+doiBMxzp3nR5lP3BuG1LfvhiblI2 SH9KLm/PZWzAcuXPztiT2+SmTpGeA7Pk0/M+wunl6oSjkA+ufWJbBU+amrChT5w7rywD EZ7Dw1OoaZw+gPb3Zi1KixtXQh/x2Or1hUt+vPk/f/Qw09T3bI/dmaHZmiHwkwQ2Gr08 XHSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hp+3+9AUZf48hagv9aooEUSQ5CMyks7M2uw5VJWYugU=; b=JSjTJcJO7dyphpcUbVYyeQGEWXGn8zrGeT67x3Hw/a/HtO4htfYPvn9/nMBjpf7saJ lts9oKD0aldGOsqnKa5uffLx2+x+768FItOD2wwwx7EgmZw9qlpgJzZdnG7n6dU7hECE ioAihXNn6uqcgSxthNM/j0H4Y3sTfIt+CnYelnvIzb4cLZgYtBSW/D4BLuRPzLtsfSN6 msGrZ2mXcPze0s8hLQ1UFyO6hU27bClyE/XfmFu5AC/EpZh51n/zUaScBQxohK7ORMAw 0TyLeO2YG0tgfY1Yvx2E+0DkKnXNmi28wiTRrW3L5pU3DVspLz6f56OFMnKrJ7qmdhHn GDsg== X-Gm-Message-State: AOAM531byoGxfEuCEk4s3cR5U9bPm9Fn6E5Za7upDBcC/SNbDxGUpv/l Jek8GwAvh15dnhbxEPCbzWdm7A== X-Received: by 2002:a05:600c:21cd:: with SMTP id x13mr71920016wmj.52.1637079920847; Tue, 16 Nov 2021 08:25:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w4sm5956224wrs.88.2021.11.16.08.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 987BB1FF9A; Tue, 16 Nov 2021 16:25:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 3/7] tests/vm: don't build using TCG by default Date: Tue, 16 Nov 2021 16:25:11 +0000 Message-Id: <20211116162515.4100231-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While it is useful to run these images using TCG their performance will not be anything like the native guests. Don't do it by default. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/393 Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20211115142915.3797652-4-alex.bennee@linaro.org> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index f8ca619cf2..ae91f5043e 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,14 +2,22 @@ .PHONY: vm-build-all vm-clean-all +HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) + EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) -IMAGES := freebsd netbsd openbsd centos fedora haiku.x86_64 +X86_IMAGES := freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) -IMAGES += ubuntu.i386 centos +X86_IMAGES += ubuntu.i386 centos ifneq ($(EFI_AARCH64),) -IMAGES += ubuntu.aarch64 centos.aarch64 +ARM64_IMAGES += ubuntu.aarch64 centos.aarch64 +endif endif + +ifeq ($(HOST_ARCH),x86_64) +IMAGES=$(X86_IMAGES) $(if $(USE_TCG),$(ARM64_IMAGES)) +else ifeq ($(HOST_ARCH),aarch64) +IMAGES=$(ARM64_IMAGES) $(if $(USE_TCG),$(X86_IMAGES)) endif IMAGES_DIR := $(HOME)/.cache/qemu-vm/images @@ -43,7 +51,7 @@ else endif @echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM" @echo "" - @echo " vm-build-all - Build QEMU in all VMs" + @echo " vm-build-all - Build QEMU in: $(IMAGES)" @echo " vm-clean-all - Clean up VM images" @echo @echo "For trouble-shooting:" @@ -56,6 +64,7 @@ endif @echo ' EXTRA_CONFIGURE_OPTS="..." - Pass to configure step' @echo " J=[0..9]* - Override the -jN parameter for make commands" @echo " LOG_CONSOLE=1 - Log console to file in: ~/.cache/qemu-vm " + @echo " USE_TCG=1 - Use TCG for cross-arch images" @echo " QEMU=/path/to/qemu - Change path to QEMU binary" ifeq ($(HAVE_PYTHON_YAML),yes) @echo " QEMU_CONFIG=/path/conf.yml - Change path to VM configuration .yml file." From patchwork Tue Nov 16 16:25:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519206 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7372775imj; Tue, 16 Nov 2021 08:33:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQoY20JhgP7wvLUrUBGc9A52zCoXkvo2bQt7G7Na9VHHGl24Fh2HUnMBtWSCOyJS/C1nc0 X-Received: by 2002:a05:620a:2486:: with SMTP id i6mr7425400qkn.522.1637080415213; Tue, 16 Nov 2021 08:33:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080415; cv=none; d=google.com; s=arc-20160816; b=BSWfM9K9TrFAQy1+BqyPw50THx/91dj09H6a9YV75ACihhi+o6McTn8fOj628j07t6 pOl1SO+tQFc84npwT56hU0G/h5JbkoWPymoyRGnidSwQSci+/iBjTTadAKdU9vkBPGZy eiB81QJxgSco8yEFiRKVF5pcU4qZ1n+viwogyEsfy0sVQ8SpDhWvdOyArqtUOWUEJAQh 9mu1EJor8I03bQ6O1JklMKHUipETJ13Ba4iVm88Atr7TlVkfEdXIXofTiM4Z0OJU10LP 1pn7+qQly1+FfkinC4GLO3BgOomQQ3IITWVt+Awivn0DwsDck0d+TB4dw1O0luaB2clF Md2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1WDIBwbb+pbmjdFoltQ0K0xm+LnAIzLLTJI2QcLMIy4=; b=0YstZLijhhdZUjEev5uK82JLKhwRqy7+271iKl27NYyQisv3e/BDtx7/myY62DcB42 0/2/McZwOQWsxzU3k9zQd4+jyeINMVisyXWFiFcBcUwl7vjZ2syj8SqRbGCCRBMAFcNI 8EOnE/Xn7X05+XfJeU5UhkH0okRIsp7EOS8rqfFvyK0Yt5AMtLFh5RteiIUb8wDghUEY stj199saMXJqTFIBGhQGT2SbTJciD02DC1zK3KcEnJqHQ9hBD9x7ATwvQyaOge0Cdl1n tV/1UV6Zjy49p5wASvfPk3zDEYoR38Cw3ry/R8VD/+4SPsi59KYkyL9aOd5DTPSmT5YM Wxdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wmb3iL4B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s8si27671608qko.313.2021.11.16.08.33.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:33:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wmb3iL4B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1Oo-000640-Ls for patch@linaro.org; Tue, 16 Nov 2021 11:33:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gv-0004dE-5n for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:25 -0500 Received: from [2a00:1450:4864:20::32e] (port=39876 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gt-0004CZ-6N for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:24 -0500 Received: by mail-wm1-x32e.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso2460760wmr.4 for ; Tue, 16 Nov 2021 08:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1WDIBwbb+pbmjdFoltQ0K0xm+LnAIzLLTJI2QcLMIy4=; b=Wmb3iL4BNxUtuXr6Uza7awe0m5etmLgwDmOycKsvenoR1U645tE6GBy6hjl/vuXPV4 +TOLHwD/7XkVedTHjjPL+WjcuZdsvChkaI9Lqpcp6JapW+TpfQe9lEY5QSLawr0GwHeF CXiZZCqTaXyH6Wl3wFQtyvz+p20jRMR9or44LAbxMoI8ER+7fBf1tVHJaZAF3kfXRlCc 5zM3rIpyzc4xlpgjDpH63c5wLqZjq7pOGQCuX86v1tY72dqCK1XHBU4gbubcK9oENQMX zrAUiUeHxXl32Iqs60PyQjEhNMSS35ufYiydEMtemJzOu7SsTni3Tmc15sv8xX7KMg/f zzYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1WDIBwbb+pbmjdFoltQ0K0xm+LnAIzLLTJI2QcLMIy4=; b=WhOZ91ShXJDYaS+IFQ0w8rDfVuWoco/6F93/nLi6S78CWagvX00IBEfe2WUfd6HIka KPjISop9IDEw5P/jC48Iqpyzl9EKNYrPLsV00usO8LWyEpCtXx6xLrV0p6+4eNe0/1g6 Q104x8QM6sm5Frv6uJoBIp0uv1LY+G0BUcL5tK1rmdv43d0J/1iLkpRO3jQOtUYw3kwW 50jjYpS4B07r88tl+ecp3MTQ0W3hnL8D8vD05/ipk0k/PH0dSKM9WbFxDcrsHHkMe7Fx 9zvnr37RHzrGRQD1uNlIcQJ+3/ip381ktFZNaTyUDLzqv28+9cBDZWPVEjH5GE7Umpf3 jjHw== X-Gm-Message-State: AOAM533BsRFiZNXw7TJJFaZ64XipB1rJkIjsDOY04242R1yhZxm5Wcbh gKSwhPv3su1mzOD7xPNVrxeXOu/RgeYdtQ== X-Received: by 2002:a1c:4d0b:: with SMTP id o11mr9093447wmh.68.1637079921713; Tue, 16 Nov 2021 08:25:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e12sm21561230wrq.20.2021.11.16.08.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B2B791FF9B; Tue, 16 Nov 2021 16:25:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 4/7] meson: remove useless libdl test Date: Tue, 16 Nov 2021 16:25:12 +0000 Message-Id: <20211116162515.4100231-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini dlopen is never used after it is sought via cc.find_library, because plugins use gmodule instead; remove the test. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20211110092454.30916-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20211115142915.3797652-5-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 2ece4fe088..baeaee4522 100644 --- a/meson.build +++ b/meson.build @@ -566,13 +566,7 @@ endif spice_headers = spice.partial_dependency(compile_args: true, includes: true) rt = cc.find_library('rt', required: false) -libdl = not_found -if 'CONFIG_PLUGIN' in config_host - libdl = cc.find_library('dl', required: false) - if not cc.has_function('dlopen', dependencies: libdl) - error('dlopen not found') - endif -endif + libiscsi = not_found if not get_option('libiscsi').auto() or have_block libiscsi = dependency('libiscsi', version: '>=1.9.0', diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 137a1a44cc..7a0a79d731 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -10,7 +10,7 @@ tcg_ss.add(files( )) tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) -tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) +tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')]) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( From patchwork Tue Nov 16 16:25:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519208 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7376599imj; Tue, 16 Nov 2021 08:36:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzt2vcrLS96zxGQzocXZR0/wr/GKjUdOLQsIDAk6UdftW9E/R76YIAerz+c8FNuGSldhJG1 X-Received: by 2002:adf:f00a:: with SMTP id j10mr10808954wro.339.1637080581949; Tue, 16 Nov 2021 08:36:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080581; cv=none; d=google.com; s=arc-20160816; b=GFGOqAoYMBxCq6cZ0M4dvaGfK9/xq7vPsFq26BZtfH4Q3N5tPC8gO00gxcChK9dW0K zqNhWWT+5MVGRV97jF0KORlGETbDSjUTzW88S0OXRCoeo4HMjQUWpt51OQom9ThO7OZc Su2s5/NRU2XwPbMC6MGmoXtOiAGf8zBcRAZKEYLskCKafCiURrqKkCiTB8alPtzzZ4wf X4Huzq39dSO5cL71jzTO5BVYL3BZrPtMUlorBjJGR6SfEZKQlTBvnARIrV8EOevYwp+/ aXfo5B4sPOnLuEVmRE5CtXFuDtOCDIxsZLKqsvI8W+bqJ+99DqqpzlOa4WK5kdMNCj3Z 2mhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7S2NWIAJNjAgH4sGoKzu35u0uEoxh61tzxU+SyoSldQ=; b=JvsJo3QMCOhhvEDhO4lyo1MQwXH+kX3LfbqWSxwpS92JAygMfhmxzO2N71Wyqw9fT+ PfLzCp6iJ/n9cOTLe/B8//k1PYxb7Gmln3tU5b/vGrrTPqrpC6jD3P8imYqLl9CdBdYz qYjfDRo1NwzxMQ5tWm5Lkn/BJqJMTGuRcGizDbytUFVNvFNWbGnd/+nGq+LRSTav7+48 VVCx6aQa8Ym/y6d3USkASYuH8ujgWS2st9cWbEqxDoWXwZTj+A7kqdvorFpriYA/5nin 3PE4u04OgSPnx3wKbe+JvUTZlt+P+Ijc9gosHCC1BUPzRRp64fNnue+BmWcR9NXNwvTT OTcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RKn1wJOv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b4si23608981wrd.256.2021.11.16.08.36.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:36:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RKn1wJOv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1RU-0002We-N4 for patch@linaro.org; Tue, 16 Nov 2021 11:36:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1H0-0004st-Fm for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:30 -0500 Received: from [2a00:1450:4864:20::329] (port=56116 helo=mail-wm1-x329.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gx-0004Ds-LU for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:30 -0500 Received: by mail-wm1-x329.google.com with SMTP id p18so8166950wmq.5 for ; Tue, 16 Nov 2021 08:25:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7S2NWIAJNjAgH4sGoKzu35u0uEoxh61tzxU+SyoSldQ=; b=RKn1wJOvmuDuLxNU/T7he9rwqqXA6o6xMxm6KsJqm6cvpr7+d6QrZ3gTCwMDaSJkVR K3DO0thR4VxvA/5RZr5oWvsy9NAPXsgMv1DVCXoRpiMWN6FEWdosjdZgCjqBrhcH0FwO OMtzI84YhiIRyZYXpAvxStdRVEicFJx8B3yjcFpX36vl+Bi0piScsxPgAUJP1IS26kX9 ww9PUtDx5mcsZTdaInuEqqaNG8QJU26Jicr7FzmdlZ4laepWFuLAP0pQC4KsUIiMHKpo FteENOTJpFW/xSFlW0TNwVlo1M9MvEGAy+Kf8QwP6wXUxT1rmvvhGpg0o2zozUak/Uew tOKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7S2NWIAJNjAgH4sGoKzu35u0uEoxh61tzxU+SyoSldQ=; b=cVgGXXpHtPaWH3Ka2By/nSmclEpkG+n6XwybgGf3A6ILYNosMYxfHI6C7hF5cHRAFM oHhNa9PoDNqrgqjZOn/VX001YNKnWyxsh+3jPsh7JcpLKVLyFXxI21vcJErAVEi/CDGA QXcz6ste/5Wpfwq+426jgsUN9YpIfQ1F7Sw3BPWe8ASX5u67gGbErCDh2BW3YY2rWnnu mnSjQL2vfB+TFWdcb6VTBhB1PgZcjySPp2ijf3yl8iiHb2EuOlMhl4aCU0G7+nnyNyn0 ub9NOXZVmYKSbdTr7MSsLKR3J3cXQaQ7cxYHTw5ZYzVLM4AhK1dr2XzEi97tkV49DWNi Blag== X-Gm-Message-State: AOAM531OqrrEroKTAPzyZUA6bU47pFwHzTjIoPkn5mvVD5oYHEV+QiXO cOdFo0IeNwUaZ1J4SXD9bVpNKg== X-Received: by 2002:a1c:a710:: with SMTP id q16mr72245010wme.138.1637079926122; Tue, 16 Nov 2021 08:25:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l8sm2973134wmc.40.2021.11.16.08.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D103D1FF9C; Tue, 16 Nov 2021 16:25:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 5/7] Jobs based on custom runners: add CentOS Stream 8 Date: Tue, 16 Nov 2021 16:25:13 +0000 Message-Id: <20211116162515.4100231-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::329 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa This introduces three different parts of a job designed to run on a custom runner managed by Red Hat. The goals include: a) propose a model for other organizations that want to onboard their own runners, with their specific platforms, build configuration and tests. b) bring awareness to the differences between upstream QEMU and the version available under CentOS Stream, which is "A preview of upcoming Red Hat Enterprise Linux minor and major releases". c) because of b), it should be easier to identify and reduce the gap between Red Hat's downstream and upstream QEMU. The components of this custom job are: I) OS build environment setup code: - additions to the existing "build-environment.yml" playbook that can be used to set up CentOS/EL 8 systems. - a CentOS Stream 8 specific "build-environment.yml" playbook that adds to the generic one. II) QEMU build configuration: a script that will produce binaries with features as similar as possible to the ones built and packaged on CentOS stream 8. III) Scripts that define the minimum amount of testing that the binaries built with the given configuration (point II) under the given OS build environment (point I) should be subjected to. IV) Job definition: GitLab CI jobs that will dispatch the build/test jobs (see points #II and #III) to the machine specifically configured according to #I. Signed-off-by: Cleber Rosa Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Tested-by: Willian Rampazzo Message-Id: <20211111160501.862396-2-crosa@redhat.com> Message-Id: <20211115142915.3797652-6-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index 277975e4ad..db3f571d5f 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -49,3 +49,10 @@ S390X_RUNNER_AVAILABLE If you've got access to an IBM Z host that can be used as a gitlab-CI runner, you can set this variable to enable the tests that require this kind of host. The runner should be tagged with "s390x". + +CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +If you've got access to a CentOS Stream 8 x86_64 host that can be +used as a gitlab-CI runner, you can set this variable to enable the +tests that require this kind of host. The runner should be tagged with +both "centos_stream_8" and "x86_64". diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index a89a20da48..1f56297dfa 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -248,3 +248,32 @@ ubuntu-20.04-aarch64-notcg: - ../configure --disable-libssh --disable-tcg - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 + +centos-stream-8-x86_64: + allow_failure: true + needs: [] + stage: build + tags: + - centos_stream_8 + - x86_64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: on_failure + expire_in: 7 days + paths: + - build/tests/results/latest/results.xml + - build/tests/results/latest/test-results + reports: + junit: build/tests/results/latest/results.xml + before_script: + - JOBS=$(expr $(nproc) + 1) + script: + - mkdir build + - cd build + - ../scripts/ci/org.centos/stream/8/x86_64/configure + - make -j"$JOBS" + - make NINJA=":" check + - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml new file mode 100644 index 0000000000..42b0471634 --- /dev/null +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -0,0 +1,51 @@ +--- +- name: Installation of extra packages to build QEMU + hosts: all + tasks: + - name: Extra check for CentOS Stream 8 + lineinfile: + path: /etc/redhat-release + line: CentOS Stream release 8 + state: present + check_mode: yes + register: centos_stream_8 + + - name: Enable PowerTools repo on CentOS Stream 8 + ini_file: + path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo + section: powertools + option: enabled + value: "1" + when: + - ansible_facts['distribution'] == 'CentOS' + - ansible_facts['distribution_major_version'] == '8' + - centos_stream_8 + + - name: Install basic packages to build QEMU on CentOS Stream 8 + dnf: + name: + - device-mapper-multipath-devel + - glusterfs-api-devel + - gnutls-devel + - libcap-ng-devel + - libcurl-devel + - libfdt-devel + - libiscsi-devel + - libpmem-devel + - librados-devel + - librbd-devel + - libseccomp-devel + - libssh-devel + - libxkbcommon-devel + - ninja-build + - numactl-devel + - python3-sphinx + - redhat-rpm-config + - snappy-devel + - spice-server-devel + - systemd-devel + state: present + when: + - ansible_facts['distribution'] == 'CentOS' + - ansible_facts['distribution_major_version'] == '8' + - centos_stream_8 diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure new file mode 100755 index 0000000000..048e80dc49 --- /dev/null +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -0,0 +1,208 @@ +#!/bin/sh -e +# +# Configuration for QEMU based on CentOS Stream 8 x86_64 builds +# +# The "configure" command line is based on: +# +# https://git.centos.org/rpms/qemu-kvm/blob/c8s-stream-rhel/f/SPECS/qemu-kvm.spec +# +# But, because the SPEC file contains a number of conditionals and +# variable and expansions only available at RPM build time, this version +# was initially generated from an actual RPM build on an x86_64 platform. +# +# From that initial version, options that are required or are a +# consequence of non-upstream patches have been adapted. One example +# is "--without-default-devices" which is *not* present here, given +# that patches adding downstream specific devices are not available. +# +../configure \ +--prefix="/usr" \ +--libdir="/usr/lib64" \ +--datadir="/usr/share" \ +--sysconfdir="/etc" \ +--interp-prefix=/usr/qemu-%M \ +--localstatedir="/var" \ +--docdir="/usr/share/doc" \ +--libexecdir="/usr/libexec" \ +--extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \ +--extra-cflags="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \ +--with-suffix="qemu-kvm" \ +--firmwarepath=/usr/share/qemu-firmware \ +--with-git=meson \ +--with-git-submodules=update \ +--target-list="x86_64-softmmu" \ +--block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \ +--audio-drv-list="" \ +--block-drv-ro-whitelist="vmdk,vhdx,vpc,https,ssh" \ +--with-coroutine=ucontext \ +--with-git=git \ +--tls-priority=@QEMU,SYSTEM \ +--disable-attr \ +--disable-auth-pam \ +--disable-avx2 \ +--disable-avx512f \ +--disable-bochs \ +--disable-bpf \ +--disable-brlapi \ +--disable-bsd-user \ +--disable-bzip2 \ +--disable-cap-ng \ +--disable-capstone \ +--disable-cfi \ +--disable-cfi-debug \ +--disable-cloop \ +--disable-cocoa \ +--disable-coroutine-pool \ +--disable-crypto-afalg \ +--disable-curl \ +--disable-curses \ +--disable-debug-info \ +--disable-debug-mutex \ +--disable-debug-tcg \ +--disable-dmg \ +--disable-docs \ +--disable-fuse \ +--disable-fuse-lseek \ +--disable-gcrypt \ +--disable-gio \ +--disable-glusterfs \ +--disable-gnutls \ +--disable-gtk \ +--disable-guest-agent \ +--disable-guest-agent-msi \ +--disable-hax \ +--disable-hvf \ +--disable-iconv \ +--disable-kvm \ +--disable-libdaxctl \ +--disable-libiscsi \ +--disable-libnfs \ +--disable-libpmem \ +--disable-libssh \ +--disable-libudev \ +--disable-libusb \ +--disable-libxml2 \ +--disable-linux-aio \ +--disable-linux-io-uring \ +--disable-linux-user \ +--disable-live-block-migration \ +--disable-lto \ +--disable-lzfse \ +--disable-lzo \ +--disable-malloc-trim \ +--disable-membarrier \ +--disable-modules \ +--disable-module-upgrades \ +--disable-mpath \ +--disable-multiprocess \ +--disable-netmap \ +--disable-nettle \ +--disable-numa \ +--disable-nvmm \ +--disable-opengl \ +--disable-parallels \ +--disable-pie \ +--disable-pvrdma \ +--disable-qcow1 \ +--disable-qed \ +--disable-qom-cast-debug \ +--disable-rbd \ +--disable-rdma \ +--disable-replication \ +--disable-rng-none \ +--disable-safe-stack \ +--disable-sanitizers \ +--disable-sdl \ +--disable-sdl-image \ +--disable-seccomp \ +--disable-slirp-smbd \ +--disable-smartcard \ +--disable-snappy \ +--disable-sparse \ +--disable-spice \ +--disable-strip \ +--disable-system \ +--disable-tcg \ +--disable-tools \ +--disable-tpm \ +--disable-u2f \ +--disable-usb-redir \ +--disable-user \ +--disable-vde \ +--disable-vdi \ +--disable-vhost-crypto \ +--disable-vhost-kernel \ +--disable-vhost-net \ +--disable-vhost-scsi \ +--disable-vhost-user \ +--disable-vhost-user-blk-server \ +--disable-vhost-vdpa \ +--disable-vhost-vsock \ +--disable-virglrenderer \ +--disable-virtfs \ +--disable-virtiofsd \ +--disable-vnc \ +--disable-vnc-jpeg \ +--disable-vnc-png \ +--disable-vnc-sasl \ +--disable-vte \ +--disable-vvfat \ +--disable-werror \ +--disable-whpx \ +--disable-xen \ +--disable-xen-pci-passthrough \ +--disable-xfsctl \ +--disable-xkbcommon \ +--disable-zstd \ +--enable-attr \ +--enable-avx2 \ +--enable-cap-ng \ +--enable-capstone \ +--enable-coroutine-pool \ +--enable-curl \ +--enable-debug-info \ +--enable-docs \ +--enable-fdt \ +--enable-gcrypt \ +--enable-glusterfs \ +--enable-gnutls \ +--enable-guest-agent \ +--enable-iconv \ +--enable-kvm \ +--enable-libiscsi \ +--enable-libpmem \ +--enable-libssh \ +--enable-libusb \ +--enable-libudev \ +--enable-linux-aio \ +--enable-lzo \ +--enable-malloc-trim \ +--enable-modules \ +--enable-mpath \ +--enable-numa \ +--enable-opengl \ +--enable-pie \ +--enable-rbd \ +--enable-rdma \ +--enable-seccomp \ +--enable-snappy \ +--enable-smartcard \ +--enable-spice \ +--enable-system \ +--enable-tcg \ +--enable-tools \ +--enable-tpm \ +--enable-trace-backend=dtrace \ +--enable-usb-redir \ +--enable-virtiofsd \ +--enable-vhost-kernel \ +--enable-vhost-net \ +--enable-vhost-user \ +--enable-vhost-user-blk-server \ +--enable-vhost-vdpa \ +--enable-vhost-vsock \ +--enable-vnc \ +--enable-vnc-png \ +--enable-vnc-sasl \ +--enable-werror \ +--enable-xkbcommon diff --git a/scripts/ci/org.centos/stream/8/x86_64/test-avocado b/scripts/ci/org.centos/stream/8/x86_64/test-avocado new file mode 100755 index 0000000000..7aeecbcfb8 --- /dev/null +++ b/scripts/ci/org.centos/stream/8/x86_64/test-avocado @@ -0,0 +1,70 @@ +#!/bin/sh -e +# +# Runs a previously vetted list of tests, either marked explicitly for +# KVM and x86_64, or tests that are generic enough to be valid for all +# targets. Such a test list can be generated with: +# +# ./tests/venv/bin/avocado list --filter-by-tags-include-empty \ +# --filter-by-tags-include-empty-key -t accel:kvm,arch:x86_64 \ +# tests/avocado/ +# +# This is almost the complete list of avocado based tests available at +# the time this was compile, with the following exceptions: +# +# * Require machine type "x-remote": +# - tests/avocado/multiprocess.py:Multiprocess.test_multiprocess_x86_64 +# +# * Needs superuser privileges: +# - tests/avocado/virtiofs_submounts.py:VirtiofsSubmountsTest.test_pre_virtiofsd_set_up +# - tests/avocado/virtiofs_submounts.py:VirtiofsSubmountsTest.test_pre_launch_set_up +# - tests/avocado/virtiofs_submounts.py:VirtiofsSubmountsTest.test_post_launch_set_up +# - tests/avocado/virtiofs_submounts.py:VirtiofsSubmountsTest.test_post_mount_set_up +# - tests/avocado/virtiofs_submounts.py:VirtiofsSubmountsTest.test_two_runs +# +# * Requires display type "egl-headless": +# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_virtio_vga_virgl +# - tests/avocado/virtio-gpu.py:VirtioGPUx86.test_vhost_user_vga_virgl +# +# * Test is marked (unconditionally) to be skipped: +# - tests/avocado/virtio_check_params.py:VirtioMaxSegSettingsCheck.test_machine_types +# +make get-vm-images +./tests/venv/bin/avocado run \ + --job-results-dir=tests/results/ \ + tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_i440fx_kvm \ + tests/avocado/boot_linux.py:BootLinuxX8664.test_pc_q35_kvm \ + tests/avocado/boot_linux_console.py:BootLinuxConsole.test_x86_64_pc \ + tests/avocado/cpu_queries.py:QueryCPUModelExpansion.test \ + tests/avocado/empty_cpu_model.py:EmptyCPUModel.test \ + tests/avocado/hotplug_cpu.py:HotPlugCPU.test \ + tests/avocado/info_usernet.py:InfoUsernet.test_hostfwd \ + tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu \ + tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_pt \ + tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict \ + tests/avocado/intel_iommu.py:IntelIOMMU.test_intel_iommu_strict_cm \ + tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_exit_error_msg_with_linux_v3_6 \ + tests/avocado/linux_initrd.py:LinuxInitrd.test_with_2gib_file_should_work_with_linux_v4_16 \ + tests/avocado/migration.py:Migration.test_migration_with_exec \ + tests/avocado/migration.py:Migration.test_migration_with_tcp_localhost \ + tests/avocado/migration.py:Migration.test_migration_with_unix \ + tests/avocado/pc_cpu_hotplug_props.py:OmittedCPUProps.test_no_die_id \ + tests/avocado/replay_kernel.py:ReplayKernelNormal.test_x86_64_pc \ + tests/avocado/reverse_debugging.py:ReverseDebugging_X86_64.test_x86_64_pc \ + tests/avocado/version.py:Version.test_qmp_human_info_version \ + tests/avocado/virtio_version.py:VirtioVersionCheck.test_conventional_devs \ + tests/avocado/virtio_version.py:VirtioVersionCheck.test_modern_only_devs \ + tests/avocado/vnc.py:Vnc.test_change_password \ + tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password \ + tests/avocado/vnc.py:Vnc.test_no_vnc \ + tests/avocado/vnc.py:Vnc.test_no_vnc_change_password \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_0 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_4_1 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_set_4_0 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_unset_4_1 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_4_0 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v1_set_4_0 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_4_0 \ + tests/avocado/x86_cpu_model_versions.py:CascadelakeArchCapabilities.test_v2_unset_4_1 \ + tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_0_alias_compatibility \ + tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias \ + tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_none_alias diff --git a/scripts/ci/org.centos/stream/README b/scripts/ci/org.centos/stream/README new file mode 100644 index 0000000000..e3eadfe3ea --- /dev/null +++ b/scripts/ci/org.centos/stream/README @@ -0,0 +1,17 @@ +This directory contains scripts for generating a build of QEMU that +closely matches the CentOS Stream[1] builds of the qemu-kvm package. + +To have the environment ready to configure, build QEMU and run tests, +please start with a CentOS Stream machine and: + + * apply the generic "build-environment.yml" playbook located at + scripts/ci/setup + + * apply the "build-environment.yml" in the directory following the + CentOS Stream version (such as "8"). + +This currently only covers CentOS Stream 8 environments and +packages[2]. + +[1] https://www.centos.org/centos-stream/ +[2] https://git.centos.org/rpms/qemu-kvm/commits/c8s-stream-rhel diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 581c1c75d1..599896cc5b 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -114,3 +114,41 @@ when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '20.04' + + - name: Install basic packages to build QEMU on EL8 + dnf: + # This list of packages start with tests/docker/dockerfiles/centos8.docker + # but only include files that are common to all distro variants and present + # in the standard repos (no add-ons) + name: + - bzip2 + - bzip2-devel + - dbus-daemon + - diffutils + - gcc + - gcc-c++ + - genisoimage + - gettext + - git + - glib2-devel + - libaio-devel + - libepoxy-devel + - libgcrypt-devel + - lzo-devel + - make + - mesa-libEGL-devel + - nettle-devel + - nmap-ncat + - perl-Test-Harness + - pixman-devel + - python36 + - rdma-core-devel + - spice-glib-devel + - spice-server + - systemtap-sdt-devel + - tar + - zlib-devel + state: present + when: + - ansible_facts['distribution_file_variety'] == 'RedHat' + - ansible_facts['distribution_version'] == '8' From patchwork Tue Nov 16 16:25:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519207 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7372893imj; Tue, 16 Nov 2021 08:33:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEoXHKIKqjemrti/25+Ov+0NN706Rji5nuLmuJb15nWNFCb6IliPK9s211TG+Nl++53fSW X-Received: by 2002:a05:6214:ccc:: with SMTP id 12mr46639816qvx.8.1637080421370; Tue, 16 Nov 2021 08:33:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080421; cv=none; d=google.com; s=arc-20160816; b=FQZtwGHiEsVwNV4NLZV0iRxq7K6KDO2XB9+mjKcbHrFBb1XaINAKhJQBxNpU/BKM4/ 5PoRjndZk7wDCzMaXqmMvGqwJWpGEzHvxBSsL3ztdi9Pcgbdr0jsyN10hl2kvPTHyLIc XCFbldoq5jWkUPjPBXsXVqpvjsiqbGA6jpoHKKhdpZT9hPe+dx0oDk6L5p43fuA/4TXE 6G2QtFxlS6I6rSqYsr65IoyhpEgptwuXTarIGs/x6mqaTZu0N/LZRPjhJGQ9bA6XDKks RaeytmGG+FFQmG3e2Y6njs7x7DX3UCrcOQjWpXnAyxOyEQhPEJNWLtQ1YTE1lKFQFUBi LTzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vntPIQjCTPZEqUV7VqdeizhS0nksmh+noAYNsVn0gJA=; b=RlB5086OlIlbGSCQVmbI7xpqlJd2aw+n4KTSwy1zxdAfBe0T5ljCe/fKzsNJyGuEdS afilqcTtJkxBAeHnytH1hSlF5HhbLSXwe1FKGsvEn265DQ6GlqK5W2OkHnvbfCVlyDw1 5PrkckgGEOJuGq5lCm7TRniupOQHBj71FMlbaFKa0fXpghEegPiPMRJP8uLW7xBe1oC8 u6AcWvfAfTktQguxsnJ/iYG2gTKfgez96LiR/rBD2fGoBR7qr52E23lz6dh+xfconMFo U7/j7p4Gf+E9lLsFbIYDgaUftp8qOGZ4qIeqeWTl8i+QcHGvCfPIq9LMb8hJ8KowwE1l aBaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Joq5DzS5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f8si14158864qte.244.2021.11.16.08.33.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:33:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Joq5DzS5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1Ot-00064x-9m for patch@linaro.org; Tue, 16 Nov 2021 11:33:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gy-0004nG-3p for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:28 -0500 Received: from [2a00:1450:4864:20::432] (port=38419 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gv-0004DH-No for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:27 -0500 Received: by mail-wr1-x432.google.com with SMTP id u18so38709515wrg.5 for ; Tue, 16 Nov 2021 08:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vntPIQjCTPZEqUV7VqdeizhS0nksmh+noAYNsVn0gJA=; b=Joq5DzS5tEURqQmAERxziuxJ6cq+d/N2pjsAS2tso5hJp5vORqWxdeQuN5yzbEoXzF qodTmpv/bTxXbF8x15PIMNZNb3BAUxJ2gpH5tECKj3FDfMtKyxsV8e1e/iQmSTdOI/nD cdEla+YjWoN/J2n/uSV2vh9vFmNNcwdydGaLEvsGvIITm3M8lGpmj+kA4gKBFHUfHcrG zM6PboUogPJLKuE2XJrHGhogt/8K+gbAnl4KHqTV/NAH3TmNj/T3luZbV6HxAKmn6GwG jFoj3fg5LsHnALViJ9MK0nF+oq26u83lhmjjkorF4cTimT3sWP+21hecCz9JP1jubBGx /X+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vntPIQjCTPZEqUV7VqdeizhS0nksmh+noAYNsVn0gJA=; b=NFgIgusOjENFLx/dfNXgZOwHYOWK/VVPxiW9JnZO3iUb5I1L20EvN6yFCPWLcznRu1 paxBmrokKBOdyxG5APMEiMNLxhmUFIwfsOcL9oYxlGQbTFG2V3IxQjjsVfeHHc83Bgqz 7REwzhITsFjXZbrT/dQvXpoCzvpwHEFVE1ig1B//ukjqDDbuM7+F8ac+Wybl9nUn9IEr AsSziZvXMEcsK6ALjaGwOXkvxr1bUScCkUO7xEA9/Nsv/HGCYL0qqqtc9fXKfZe68mR1 5JuPK1pi29+SBS6J+i/0L9iXlf6nrMuo0lprQDFgbSeJwXdZ9NPDTz3m3MsBwIRJVfyN aqvQ== X-Gm-Message-State: AOAM533CJ48IwlkURgzPFZkvuexKqe75C82gJ3UMcGvc1AbBl7HnBqtM V83/8tio/rQsJOFVqm9szk7V6A== X-Received: by 2002:a05:6000:18a3:: with SMTP id b3mr10855505wri.343.1637079924224; Tue, 16 Nov 2021 08:25:24 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f19sm3835401wmq.34.2021.11.16.08.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 02E7C1FF9D; Tue, 16 Nov 2021 16:25:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 6/7] gitlab-ci: Split custom-runners.yml in one file per runner Date: Tue, 16 Nov 2021 16:25:14 +0000 Message-Id: <20211116162515.4100231-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé To ease maintenance, add the custom-runners/ directory and split custom-runners.yml in 3 files, all included by the current custom-runners.yml: - ubuntu-18.04-s390x.yml - ubuntu-20.04-aarch64.yml - centos-stream-8-x86_64.yml Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20211115095608.2436223-1-philmd@redhat.com> Reviewed-by: Willian Rampazzo Message-Id: <20211115142915.3797652-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 1f56297dfa..056c374619 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -13,267 +13,7 @@ variables: GIT_STRATEGY: clone -# All ubuntu-18.04 jobs should run successfully in an environment -# setup by the scripts/ci/setup/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" -ubuntu-18.04-s390x-all-linux-static: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" - script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - - mkdir build - - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - - make --output-sync -j`nproc` check-tcg V=1 - -ubuntu-18.04-s390x-all: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - - ../configure --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-18.04-s390x-alldbg: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --enable-debug --disable-libssh - - make clean - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-18.04-s390x-clang: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-18.04-s390x-tci: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --enable-tcg-interpreter - - make --output-sync -j`nproc` - -ubuntu-18.04-s390x-notcg: - needs: [] - stage: build - tags: - - ubuntu_18.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --disable-tcg - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -# All ubuntu-20.04 jobs should run successfully in an environment -# setup by the scripts/ci/setup/qemu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" -ubuntu-20.04-aarch64-all-linux-static: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - - mkdir build - - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - - make --output-sync -j`nproc` check-tcg V=1 - -ubuntu-20.04-aarch64-all: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-20.04-aarch64-alldbg: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - - ../configure --enable-debug --disable-libssh - - make clean - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-20.04-aarch64-clang: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -ubuntu-20.04-aarch64-tci: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --enable-tcg-interpreter - - make --output-sync -j`nproc` - -ubuntu-20.04-aarch64-notcg: - needs: [] - stage: build - tags: - - ubuntu_20.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --disable-tcg - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - -centos-stream-8-x86_64: - allow_failure: true - needs: [] - stage: build - tags: - - centos_stream_8 - - x86_64 - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: on_failure - expire_in: 7 days - paths: - - build/tests/results/latest/results.xml - - build/tests/results/latest/test-results - reports: - junit: build/tests/results/latest/results.xml - before_script: - - JOBS=$(expr $(nproc) + 1) - script: - - mkdir build - - cd build - - ../scripts/ci/org.centos/stream/8/x86_64/configure - - make -j"$JOBS" - - make NINJA=":" check - - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado +include: + - local: '/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' + - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml new file mode 100644 index 0000000000..49aa703f55 --- /dev/null +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml @@ -0,0 +1,28 @@ +centos-stream-8-x86_64: + allow_failure: true + needs: [] + stage: build + tags: + - centos_stream_8 + - x86_64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: on_failure + expire_in: 7 days + paths: + - build/tests/results/latest/results.xml + - build/tests/results/latest/test-results + reports: + junit: build/tests/results/latest/results.xml + before_script: + - JOBS=$(expr $(nproc) + 1) + script: + - mkdir build + - cd build + - ../scripts/ci/org.centos/stream/8/x86_64/configure + - make -j"$JOBS" + - make NINJA=":" check + - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado diff --git a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml new file mode 100644 index 0000000000..f39d874a1e --- /dev/null +++ b/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml @@ -0,0 +1,118 @@ +# All ubuntu-18.04 jobs should run successfully in an environment +# setup by the scripts/ci/setup/build-environment.yml task +# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" + +ubuntu-18.04-s390x-all-linux-static: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$S390X_RUNNER_AVAILABLE" + script: + # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 + # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check-tcg V=1 + +ubuntu-18.04-s390x-all: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$S390X_RUNNER_AVAILABLE" + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-18.04-s390x-alldbg: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$S390X_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --enable-debug --disable-libssh + - make clean + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-18.04-s390x-clang: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$S390X_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-18.04-s390x-tci: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$S390X_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --enable-tcg-interpreter + - make --output-sync -j`nproc` + +ubuntu-18.04-s390x-notcg: + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$S390X_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --disable-tcg + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml new file mode 100644 index 0000000000..920e388bd0 --- /dev/null +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -0,0 +1,118 @@ +# All ubuntu-20.04 jobs should run successfully in an environment +# setup by the scripts/ci/setup/qemu/build-environment.yml task +# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" + +ubuntu-20.04-aarch64-all-linux-static: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$AARCH64_RUNNER_AVAILABLE" + script: + # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 + # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check-tcg V=1 + +ubuntu-20.04-aarch64-all: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-20.04-aarch64-alldbg: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$AARCH64_RUNNER_AVAILABLE" + script: + - mkdir build + - cd build + - ../configure --enable-debug --disable-libssh + - make clean + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-20.04-aarch64-clang: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-20.04-aarch64-tci: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --enable-tcg-interpreter + - make --output-sync -j`nproc` + +ubuntu-20.04-aarch64-notcg: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --disable-libssh --disable-tcg + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 From patchwork Tue Nov 16 16:25:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 519203 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp7365813imj; Tue, 16 Nov 2021 08:28:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1vFkKW1q3R50Dtv0wOD5NNE4mWNMaF5Ou+R1AmdESkB6MBrm3Quviwlx0kYDEHjcb3FVD X-Received: by 2002:a67:d893:: with SMTP id f19mr55785831vsj.39.1637080123976; Tue, 16 Nov 2021 08:28:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637080123; cv=none; d=google.com; s=arc-20160816; b=NGbQEGusIDc1nBzoKw2L1os2+XWOx1SCx4g1OtWZ4Aw1Rc1T8qGFTWQ6sDfbilJS3V re1wzS3z01pUQIk25F2q5IVh6yohpg6HcTke6pqt3PWDum7LgPRa7UbB6XDLRInOhBep qnT019rwOKwMbVQEySRUbf0CovFz+exGdXW0RHsvPNy6Y0FY3kmXm6X2yadfDc2TX4sc H4mh8H3P3nbjZjv7nm+vwvTmK3QoGRULRn35Q8QvoVZFKDkwmMAKsW+9HCrtnUEljYcf sK0MUC/KM9lpZwlYH0KIzmXcz089n6syZXGWXxjuSxqer0k8LHgrfYRdazQ/1rIErx3y Lflg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+WVAywrlpluP52dH3NNzrsF0nn2WTrXKhzycjudmP84=; b=rQ8glRJt2b7DVLa7eebJ7uw4Nd2O8iWtiqTNiWJGMFbzba0n/pZh9DUAPafGYZb1Dt sJDNtyMi6s/XgK1/Mn4UCiCFyK8F0BZZ8N8mftFE/rxaFvftz/3afSkwdf3ZflOkE7k1 yf187ZEg6ylZTeI5sMHQzaIEJzk0nskbZAi5rPRFws87za+WxagKRTtoLsc+07FEGH7l QFlw1rzR5tw961pDg0oyeq5oUJfVnF8jTdeIMhCJnenFEyfOSziLglbIpSXaI4yD1ihW rG5LYJICy1KHKYWD7Ijbe8wk2iffkzKOCu8NHAEvTffzUJ5OhX8Lp7PwxRIi+TDLAXqy p7ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V4s0aoae; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v23si24203890uat.43.2021.11.16.08.28.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 08:28:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V4s0aoae; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1K7-0006uk-Eh for patch@linaro.org; Tue, 16 Nov 2021 11:28:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn1Gw-0004iM-QL for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:26 -0500 Received: from [2a00:1450:4864:20::332] (port=42829 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn1Gv-0004DA-1J for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:25:26 -0500 Received: by mail-wm1-x332.google.com with SMTP id d72-20020a1c1d4b000000b00331140f3dc8so2842359wmd.1 for ; Tue, 16 Nov 2021 08:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+WVAywrlpluP52dH3NNzrsF0nn2WTrXKhzycjudmP84=; b=V4s0aoaevL3Qkstxx37uMUNTUP6VAbU+bQn+HAR4U6CM8JgXe4qYOpOJiUK6xheT5s QHJyKcV6p7SCUZAYi06pFdGFXLzNJFEPRqtEGjOjeKPFpyWOvB3iwGuPftZ5ddJCqT1y V1MUCg3mwiLt5bltOJ12CVVuf2Bqae9kCO5AbQEvC9fHnoqukjto8wzUsquUbJdp5mRE yj6fxapdTVZWVbUPGT78C3xkOhcmqjN7MBcztSCy+da8nK3+OCN7C1/Z3xmXLGuEUZEf Ge+uFJwWZ/pg+wRr+tEaA32xfptwPVT2QsP8JgYQQ44b7pBj01AduhcLICGVQyJm9zwZ sWUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+WVAywrlpluP52dH3NNzrsF0nn2WTrXKhzycjudmP84=; b=5NQweyEGrDRgq+CERe4hYH4HPQLoCPaS8ESERb0yDbUPY2Z1RXwpIFmc8qDBodNdVv 5WD8b95BmRP0kbD/Qgfkj3MCTMTKcwTjQdi1z9LRhp/fQWhsPiDB1g/KA1sRFaKpLv8M W3gxhj3Lk92XNJSgg8UAXSH4g5ATqlhog7HkBx/aKp2QGUqMVll5+Zt+33XqxhPETidj v81QMXjFX+AXRw2mGvouGSPsoxHDEI93472AOb3CyWYYpPsw8sRBCDhoLZIn/g7LrphP XrTYReAzJNE3ia7ybMENXwBaBFUKlVa9PNiOvvjz2S1Rt+0LVlMnWsuiXE6A02AtaQZR Gftw== X-Gm-Message-State: AOAM532HeztTQ9NRPbqIofNIoljF6lxBovApK0AdikO6vJUFAqvKJv1G lztWgTUIHSyr6Ogfscy83WUN1A== X-Received: by 2002:a05:600c:2dc1:: with SMTP id e1mr9087022wmh.170.1637079923622; Tue, 16 Nov 2021 08:25:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n13sm18141009wrt.44.2021.11.16.08.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 08:25:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 11EC41FF9E; Tue, 16 Nov 2021 16:25:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 7/7] gitlab: skip cirrus jobs on master and stable branches Date: Tue, 16 Nov 2021 16:25:15 +0000 Message-Id: <20211116162515.4100231-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211116162515.4100231-1-alex.bennee@linaro.org> References: <20211116162515.4100231-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé On the primary QEMU repository we want the CI jobs to run on the staging branch as a gating CI test. Cirrus CI has very limited job concurrency, so if there are too many jobs triggered they'll queue up and hit the GitLab CI job timeout before they complete on Cirrus. If we let Cirrus jobs run again on the master branch immediately after merging from staging, that just increases the chances jobs will get queued and subsequently timeout. The same applies for merges to the stable branches. User forks meanwhile should be allowed to run Cirrus CI jobs freely. Signed-off-by: Daniel P. Berrangé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Message-Id: <20211116112757.1909176-1-berrange@redhat.com> Signed-off-by: Alex Bennée diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index e7b25e7427..cc2f2e8906 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -40,6 +40,9 @@ - cat .gitlab-ci.d/cirrus/$NAME.yml - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml rules: + # Allow on 'staging' branch and 'stable-X.Y-staging' branches only + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH !~ /staging/' + when: never - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" x64-freebsd-12-build: