From patchwork Fri Aug 6 14:10: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: 492838 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp360756jap; Fri, 6 Aug 2021 07:12:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5I349m7PirPktHiw/tlsTOPltP4Ou0J8fzpg+8Q8nnj0o/g73gtFI3eUYcRO+O8SO003D X-Received: by 2002:a05:6638:1608:: with SMTP id x8mr10105444jas.115.1628259174735; Fri, 06 Aug 2021 07:12:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628259174; cv=none; d=google.com; s=arc-20160816; b=Rba3x9s+jgH9e9O1es7du7VwIQ7WgQPuQl61kAZlKYl0mkC5mS61lhdCHQap93B7IQ eKwXAv9q9X+hsUG/gdzICoso4eKOlkCbeWlC3cyVDB6NJ/rM2Zj9nGxyqxyrgAAjv+Qb lgIELgxfajHnASRKeJnj4GIRUyl22kHykZ+KzQmbWSbk+cqNR3kAWUKN+3w3aYzu3Myc U92BFJOY5qaIl7UWcYw2q/mqFp3zl6Py5HntF5lQ147WwA6SgMtIDNB1VxT+kPP8xSqc Les1qgnRQ61rq4mJlLlMwUijGN5gTDnd2vq+5ggZwhLlCdSyCUmkZD8KuhKDXbNKbnrx rLXg== 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=KuuTtPGMwAVo25QsuYA2XGY+9yV6r/Lp4YSi1ojpHU4=; b=E6IjLjpykW+4jVP/unehRL5DwN0hCmImkcf5xCfPTUzWF1DXwlVx/ZcPG25SDBJ8Ig t8XXGtA5vEgujZqjsfvdBiArMvrbmW1Svz+BJkELzjtzQOsmra+488j967K9HbPRkINl nMTKd6EBiXBNqufCXjLUYklDc0EXuFuijDLoqDxOBnlJKlA9BOFX3v4ah51pwK6Xr19x RQERZt8diPB+HQvh5/C6tPmHwjPP1k+HkzZuSL61Rq7kT+AT+Qcm3uJUPtv+yQyV6g3/ sz1GJWC0hnebJMuth9FcRRR+TafxWxjw6zVSBcon46nDZWgmeHkwbS6ZSlfN2Y/wrHNy FnFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pr8Jfm7D; 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 y7si8804831jae.125.2021.08.06.07.12.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Aug 2021 07:12:54 -0700 (PDT) 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=Pr8Jfm7D; 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]:57796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC0ak-0000PX-86 for patch@linaro.org; Fri, 06 Aug 2021 10:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC0YJ-0004sJ-P7 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:23 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mC0YH-0008Eo-Tl for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:23 -0400 Received: by mail-wr1-x42f.google.com with SMTP id k4so11306969wrc.0 for ; Fri, 06 Aug 2021 07:10:21 -0700 (PDT) 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=KuuTtPGMwAVo25QsuYA2XGY+9yV6r/Lp4YSi1ojpHU4=; b=Pr8Jfm7DrfLHR/OHvuRR1n7QRLGa9SiuZnfyMcmWZ1KDxsIEMu/54VXjgDG23Q6h+e uWhueKD84dLf5jwXWzdN3TApiduqdX8Z+rAgs88C1LY0w3e4rVjy2/fMl3LwDjWFcCSS oWDSjjvkWNu3Hitm/B/rK0s9Bu2zg002V0vzRWY1/UpaAkPAHU12OCBe3zyWn6MT2Pi8 w6HlwmO+l9yrF8+GHotc9//MWbqXMiLk+SdXPbYjYjBmZ49psYNQnd0uqztpzINL/eku nS6m8wezzDbS4bQdP/QEZY0ZBQPyQQMs3+GAlGu/D0u5mjl1Os2TTw9SyULq6ElJDnMO udRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KuuTtPGMwAVo25QsuYA2XGY+9yV6r/Lp4YSi1ojpHU4=; b=A8QRnGaVU09vSJhGhyM2jY+YAbEoq1q9FPQGvJ9hC1GMwswy5ghmr8akrDeldgCCd1 qH8W0h6FIOJaNNIId8RS2gNK7kuB5p27FexTQKqLyvgGHj6cn1XO3rVgNf9Yr1iB20Ww 2TUeS4/1j2nRt+ycrH+Jyk1itinUZykU5JWBXUiFy2x0y44T5voRAJCt8U9jM7FHoamY hF3lt14kfSrFw7ay9boqaJEUfDKaWBN2ukHJxuOy7lTVgkD6YI7pBfSkdo7ca/0nr30H Oh8YYahpXTicRvtHDeKTVSjMW1Pw19B8tQ3jV/bmiC3k/KWbDp4c6MbPFdi7DyOP34MK w4Aw== X-Gm-Message-State: AOAM533ucJjeHXTZM7pWvPk5MUbxPZUcMXMESt55OiFtDy7Pew+RsSkl cgmVjjBqVNGS138172jJXlQ0yQ== X-Received: by 2002:a5d:4a4c:: with SMTP id v12mr10830665wrs.256.1628259020572; Fri, 06 Aug 2021 07:10:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d15sm9390765wrn.28.2021.08.06.07.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 07:10:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CBAFE1FF98; Fri, 6 Aug 2021 15:10:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/4] plugins/execlog: removed unintended "s" at the end of log lines. Date: Fri, 6 Aug 2021 15:10:12 +0100 Message-Id: <20210806141015.2487502-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806141015.2487502-1-alex.bennee@linaro.org> References: <20210806141015.2487502-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Bennée Message-Id: <20210803151428.125323-1-ma.mandourr@gmail.com> --- contrib/plugins/execlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index 2de9f0d7d4..a5275dcc15 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -67,7 +67,7 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) /* Print previous instruction in cache */ if (s->len) { qemu_plugin_outs(s->str); - qemu_plugin_outs("s\n"); + qemu_plugin_outs("\n"); } /* Store new instruction in cache */ From patchwork Fri Aug 6 14:10: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: 492839 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp362184jap; Fri, 6 Aug 2021 07:14:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEgb9tOIcCDyMsbKETZsai4cnowtkIeMqev2oq1lWYHOi3ag15eHNruA3xEkQLLw8wK6MK X-Received: by 2002:a5d:928c:: with SMTP id s12mr663663iom.151.1628259250763; Fri, 06 Aug 2021 07:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628259250; cv=none; d=google.com; s=arc-20160816; b=ToVuDTvrLyqgmITjQ5w2H+JomMD0HXx0S/X6aYp0hXO+NHsc5aTZRa8qgJAF9VMI3U /nj88GNVeKio6lJGrxXyyC4+WOnNNyYVnlzvXtRL2ZISX4NX8hgRCN4h/UXPpJCvIvBf aUz/dEHdZEpxHFC9T98VuYI2B8lyZKJupAYZRFDacteq0TSPPoyudl5vKgkRF9cgO5fO aelAxb3k0YkqPuraud6waqYxx1v+YuO7nb2S8LpHmgpbZDWfGDs2QmLk8tI/NrY1FLGC rcjRMEwZMWx9zTZzW06BGFO63M+d+qmKIXCD9f/RG0uqiSEpwrdZ5yI+gRFZ4qoTTHyu PO/w== 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=8jCFlyS7G8y2OceXjiqJdE3h+q0A8avhs1CGq9OkVms=; b=GWD3mnaobiu9uyB8NupP9mZwKpx67ao5B0RfxpVpZbVqbhhx8HT4kSBhsROeNhL/Gq 6vHJAd5gYy6ZD+Bbegz4lP2XSs7FwunRy+xtxjxywKWrkfOJi48ZhLdino+GBMo9WPxi 1X43P29y4KM6iAkYcb+TTqY1yEiIfrfpkWAYvprFSINp35M4iEXzdV2JhXiQCN7eikLS Q665PEyOVoMKZsB38c8GD1NiDP2ETnzg9J6snVWYZ0D5Q34u875DMJvtnoh5mzcb1MWH tXtUrdcKzCJ3ZeKS0oXuXmtuS3871OOh5bIM2ibBm0y4surG1/W3W6qwgwuW1y9yPcO8 C/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xu0jWKsU; 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 e16si9311436ils.75.2021.08.06.07.14.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Aug 2021 07:14:10 -0700 (PDT) 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=xu0jWKsU; 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]:60494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC0by-0002FJ-69 for patch@linaro.org; Fri, 06 Aug 2021 10:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC0YP-00052m-81 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mC0YK-0008Ix-Jr for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:28 -0400 Received: by mail-wr1-x42e.google.com with SMTP id z4so11250562wrv.11 for ; Fri, 06 Aug 2021 07:10:24 -0700 (PDT) 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=8jCFlyS7G8y2OceXjiqJdE3h+q0A8avhs1CGq9OkVms=; b=xu0jWKsUH9Ua7pKGkaQqhyZXg19OimDsRWU0nti+3U64Co2IYqBd6BgOC1iTULWnBp 6gjk5Qj7ox8lz1Tkmv6n97xqoUFZCnazcjCnqxie2kS8jlaRdLxnjNnptQyaASWjSIiz nj/c3MT71LsSl1jh/911LxsLCnjJD46I6YUkGETvsnLUMOrirj4JLITg481ckk9hjnmJ rokipc9NTS2tufNa5WSG2wk5j2LKrQg+NRaKVUiMztyYslVdcKUupTdu6D3XUklsvcEr W9mQt2q9n3fAEYkQ48e1B+lmJVrwWtEYPvlgrZjHFftnhPJbqeLAPuXe1wGmc/B8Vztp Ylhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8jCFlyS7G8y2OceXjiqJdE3h+q0A8avhs1CGq9OkVms=; b=pVCCMeWkCV4CEMKrFtspQAJcgvqnUxnoEMZZhEeeUl+bSaEjfAlO/WxnvTqUqvDmXd 8rmUWOG3IDBYDmoPjcUkxyZUBjbtWtyD5y/WJtsIOPz2DGjQGHqiOIJj4s9BwkXo0UHT di0P3NB5L6Z2gq9pLA7c2eKHqSkc+KfuBRTaLnNzj1Wvmf/iAKbh+fv/kRL9Cxtl5pBs rvM2exZhWt6EWA9wbuXZ9jPMasiFE/8QXceY6dgOs4rBgOEE9Denz3QoUXTQKJGiwnJt t58yQs2iCe1H6fc8/7cD0pdo42ysnWVUbMUFU9ofHvEaqYYhZ90g4o5hNK8t3K/8Ut5w jjBA== X-Gm-Message-State: AOAM530YTZ6KPvrffkU7x76/+qsa4C84lBT5hD9xNv3A+H5MIxbbOoZ6 Os4svPpa68UUl0Ry6yXOLXA57A== X-Received: by 2002:adf:e601:: with SMTP id p1mr11391122wrm.14.1628259023270; Fri, 06 Aug 2021 07:10:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h12sm9597311wrm.62.2021.08.06.07.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 07:10:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E224A1FF99; Fri, 6 Aug 2021 15:10:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/4] gitlab-ci: Merge "build-disabled" with "build-without-default-features" Date: Fri, 6 Aug 2021 15:10:13 +0100 Message-Id: <20210806141015.2487502-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806141015.2487502-1-alex.bennee@linaro.org> References: <20210806141015.2487502-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Both jobs are testing more or less the same thing (building QEMU with features disabled), so we are wasting precious CI cycles here by doing this twice. Merge the jobs by using --without-default-features by default and just adding some additional --disable-... switches which are not covered by the generic switch (yet). And while we're at it, also test compilation with "--disable-fdt" (which forces us to change the list of targets in this job, though, since some targets do not work without fdt). Signed-off-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210730143809.717079-2-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 97 +++++--------------------------------- 1 file changed, 13 insertions(+), 84 deletions(-) -- 2.30.2 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 903ee65f32..f390f98044 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -202,85 +202,6 @@ acceptance-system-opensuse: MAKE_CHECK_ARGS: check-acceptance -build-disabled: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: - --disable-attr - --disable-auth-pam - --disable-avx2 - --disable-bochs - --disable-brlapi - --disable-bzip2 - --disable-cap-ng - --disable-capstone - --disable-cloop - --disable-coroutine-pool - --disable-curl - --disable-curses - --disable-dmg - --disable-docs - --disable-gcrypt - --disable-glusterfs - --disable-gnutls - --disable-gtk - --disable-guest-agent - --disable-iconv - --disable-keyring - --disable-kvm - --disable-libiscsi - --disable-libpmem - --disable-libssh - --disable-libudev - --disable-libusb - --disable-libxml2 - --disable-linux-aio - --disable-live-block-migration - --disable-lzo - --disable-malloc-trim - --disable-mpath - --disable-nettle - --disable-numa - --disable-opengl - --disable-parallels - --disable-pie - --disable-qcow1 - --disable-qed - --disable-qom-cast-debug - --disable-rbd - --disable-rdma - --disable-replication - --disable-sdl - --disable-seccomp - --disable-slirp - --disable-smartcard - --disable-snappy - --disable-sparse - --disable-spice - --disable-strip - --disable-tpm - --disable-usb-redir - --disable-vdi - --disable-vhost-crypto - --disable-vhost-net - --disable-vhost-scsi - --disable-vhost-kernel - --disable-vhost-user - --disable-vhost-vdpa - --disable-vhost-vsock - --disable-virglrenderer - --disable-vnc - --disable-vte - --disable-vvfat - --disable-xen - --disable-zstd - TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu - s390x-softmmu i386-linux-user - MAKE_CHECK_ARGS: check-qtest SPEED=slow - # This jobs explicitly disable TCG (--disable-tcg), KVM is detected by # the configure script. The container doesn't contain Xen headers so # Xen accelerator is not detected / selected. As result it build the @@ -649,12 +570,20 @@ build-without-default-devices: build-without-default-features: extends: .native_build_job_template needs: - job: amd64-debian-container + job: amd64-fedora-container variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --without-default-features --disable-user - --target-list-exclude=arm-softmmu,i386-softmmu,mipsel-softmmu,mips64-softmmu,ppc-softmmu - MAKE_CHECK_ARGS: check-unit + IMAGE: fedora + CONFIGURE_ARGS: + --without-default-features + --disable-capstone + --disable-fdt + --disable-pie + --disable-qom-cast-debug + --disable-slirp + --disable-strip + TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-softmmu + sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user + MAKE_CHECK_ARGS: check-unit check-qtest SPEED=slow build-libvhost-user: stage: build From patchwork Fri Aug 6 14:10: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: 492836 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp358632jap; Fri, 6 Aug 2021 07:11:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJze0JvPPg0bvcJVHLOLdxkrPc33Mz5mOwEtRWhTCOv0wmv0iB+ybKxTfwDelWurncugMS9R X-Received: by 2002:a05:620a:109a:: with SMTP id g26mr10655796qkk.25.1628259070790; Fri, 06 Aug 2021 07:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628259070; cv=none; d=google.com; s=arc-20160816; b=LD7xtzTrtCE5FXe0vQ497gmG++GqCwMyIpA6Z62tMoshu9wc02lOru66de+hmgUkBR l7yjay0uYhnLvIl87ojBXuY4x134sN+ee1g7uz9eiNafb3+raxuPEYUD5/4dJ1LJtYFt qF2v4FmBGR4c50pWTmc0Q4M5uNJYW5nLEEyxLnhpVWk24SW8BAbH5JX2B6FFU093m5Mh wUU1Ltsf5YEUvtBeLUCHMFrX7MHRCC77r/A6iwhqwIkyBNn74dtyjYcvDR4XBEoW88l4 JqKVobhV5ltrFO+QiLgje6BUBjxynXmpZbL5J+vZ9friC04UGTux24WOZDHQnVbQLjef qspg== 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=MA8hYibKJMWIEtbNaZEoCzgws0aEufHky77lbfew1s0=; b=URxyGNK5IbIqIlJLQQDWACX48n9fmP3kADedSFLaLWwCW9jsLH5VB2De5pZFB4HOPk JyZzryEKeYhgePIbSGme9kw9G99RNkT2G8ozVLNkCEg6dZ4oZBl7mk6PVhvaIoOZYwHd oObc+OBUOt1BDJT9UlGpzObwbg+wL3EDHQSnFc44oX6pT2CEgYcCddF4eDyuxenh0yZW bbKKNCMMabHIplgrGC/a52rb9JOQF8qwOYx9l1eC/+z01KzLIlKTmW5O1vAQuVer1D8q lWxrYPw9IG2sGFuwDoVc3zo0cGr6G65X5wykEO5712wc4mabv3wNdfOefMCNRwpnF67P 0ccA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vhHbKilE; 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 f24si669010vsk.343.2021.08.06.07.11.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Aug 2021 07:11:10 -0700 (PDT) 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=vhHbKilE; 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]:51954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC0Z4-0004sv-75 for patch@linaro.org; Fri, 06 Aug 2021 10:11:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC0YI-0004rw-MP for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:22 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mC0YH-0008D5-3Z for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:22 -0400 Received: by mail-wr1-x430.google.com with SMTP id h14so11230851wrx.10 for ; Fri, 06 Aug 2021 07:10:19 -0700 (PDT) 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=MA8hYibKJMWIEtbNaZEoCzgws0aEufHky77lbfew1s0=; b=vhHbKilEv4/XB3ep0W80RT7c29rIdkquQoysSdG7rQuAhRCfGTu6CNeBVs/u3fXGmL lQQhCj4eQ3190KPb5TGYiZ026fxVvV1Q3BX/j5MNReFJ9Juii7P9g2oSGPpdAm6eQutA m9JQIWBSS1HBlXUTOFZ/GsUB6VAbBQiON/7oRLN+57iJRyJNu+bECJY2HK/Xs4yaa0T+ DAroERxN+heEL8Cnd0CUuA+5qyNsbWr3xeKWg0D+yL63HmYF+3V83Td8KPT3eIOlD9/D 4u5JPL+QP9QafD/Lsw6Aa4QTqNcnG2ZPRxFskhdAG6DrM/47XZYmBzkccnIzi383lm5Y Xteg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MA8hYibKJMWIEtbNaZEoCzgws0aEufHky77lbfew1s0=; b=HJ+nQKeO8kY3MT71QU/8lPZse/c8FuRaIv/HlZ4dwdnr2nLmf7H5ugg36FVSYNVYzw QnHhhHUyG61soUelGrkG019iGp6wPfdd9jruTvf8UCIz7g0FmlgJeGdMX5pqnP0meruY Noo/QZXFyiWg/hNMuWZvXrAlzy1RlqPs3314vYmM8x58jLIuy2yzTdpEuZnRRRDHVUNW Z+/gTF9fOCTuX8Ij5KHARlrCb/pRs2SSAOcekqABERLvpAWFbOZfu8Gd2BdjSnJjOyZK 5lx9VANDLpQvvCBHdOURrzPnMTXZgR55kPUkyHQNYr9excR3kEsRufAi9ufqqEqxHgjt AIoA== X-Gm-Message-State: AOAM532ntkZ/tQg0IqM1GyebDE0t7GGuxyYB1Rem/wbjutqb7EGDxjJT zgVxWQp6YeWpNC9fvR+4JyMtQA== X-Received: by 2002:a5d:4fd0:: with SMTP id h16mr11371134wrw.268.1628259018946; Fri, 06 Aug 2021 07:10:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n186sm14430073wme.40.2021.08.06.07.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 07:10:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 03B3D1FF9A; Fri, 6 Aug 2021 15:10:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/4] gitlab-ci: Remove superfluous "dnf install" statement Date: Fri, 6 Aug 2021 15:10:14 +0100 Message-Id: <20210806141015.2487502-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806141015.2487502-1-alex.bennee@linaro.org> References: <20210806141015.2487502-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The container already features meson and ninja, so there is no need to try to install it with dnf again. Signed-off-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210730143809.717079-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 2 -- 1 file changed, 2 deletions(-) -- 2.30.2 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f390f98044..38f08452f1 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -590,8 +590,6 @@ build-libvhost-user: image: $CI_REGISTRY_IMAGE/qemu/fedora:latest needs: job: amd64-fedora-container - before_script: - - dnf install -y meson ninja-build script: - mkdir subprojects/libvhost-user/build - cd subprojects/libvhost-user/build From patchwork Fri Aug 6 14:10: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: 492837 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp360021jap; Fri, 6 Aug 2021 07:12:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybQ9aCvH3DhdvJ6mzVOmrDv8UL/Wrwv5aXNGrxME1WeRZReGfjxGMrI/iv18J6g0Y/Gpow X-Received: by 2002:a05:6512:228c:: with SMTP id f12mr7960677lfu.154.1628259137605; Fri, 06 Aug 2021 07:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628259137; cv=none; d=google.com; s=arc-20160816; b=1I/am/2QaxU7JN9o+fS5GxybOaupa5pEILF8oWJN/bHCTMM38tGq/Qz1lPWXrnV968 azymiqbH5OfDKhOKqnx8MYmSkw1RKTl0ywf1x2mphqKLoyeUBGU6DDvST6Jd3kKhhR4o lSgGjN98fAqnRC2TJHpH2myM5fqdUB7fNYPjy9Eincn81YyNwox67eY5apu2oN71ZMEy CSgKZ0b9bhl4dtItzMwevmi3CFhASWpE25tcxZetw7pOALQOvN2XVM5pAb3lje+N1Hvo jCqgbUIIbiBeDEo4GswF40f0NNZkrvBpkSFIgyfgZxGrw8uUCOM8EoBRu0UpuC7DRHC8 vZTw== 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=2YgIsxhH4SyNOO1OygJR5Zoi6AMbZFUCPRnEytRovzU=; b=DMpc+ADhgu0XFcRUsoH3aP8trqGyab3o3ZVd3Ng77fdOI4vKGM5jpcYCCAn3P+bp2A t1Rz/dKwKDuzDc1pbs564VY9cPd9PKjk6Fx096jihiGz682CR0XJw2wY5CoalcaEWhOR dEFTsZDVZbIl9qL0rzkYKvTXEB6d1PG3IvQ/Nm2WmBMlSf+VJSt8O8YdUfKLD5qJ/qSh hlD32+kl/QXq+WUgXAB11bkGvd6lXm8X/EhClklaHR3bl1BSTXFYLQUOw4fLKTMrOAs3 i4iY41SxYBEZU5WAwiCILDuBOvvYPLOUJw7pZvJnXUmq9AbYICikkXjo7lmbqraK4oSK Y4Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=w+fW2D9H; 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 f30si9642703lfj.164.2021.08.06.07.12.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Aug 2021 07:12:17 -0700 (PDT) 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=w+fW2D9H; 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]:56278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC0a8-0007pd-BK for patch@linaro.org; Fri, 06 Aug 2021 10:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC0YL-0004ut-Kq for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:25 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:35700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mC0YI-0008G2-R0 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:10:25 -0400 Received: by mail-wr1-x432.google.com with SMTP id n12so1209763wrr.2 for ; Fri, 06 Aug 2021 07:10:22 -0700 (PDT) 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=2YgIsxhH4SyNOO1OygJR5Zoi6AMbZFUCPRnEytRovzU=; b=w+fW2D9HKd5T7zjfS9cWuphHOAZL28vGIqnejVDyZMQd7a/lLSbCY0A3O3KcFp3hcQ /VwRfYcTCLTx7+ggYTLIKCTAOGoNn6bNQif3sv/9pcIhW7AyAGstpmo6C4bDLiLwON8a tfIVIv7GSZ0XzE0Kb6xwHH8vUKevw3fTrPsF3/B+kPAnQgqHuT9W6bknZtPy9Fp/Sw8J uj6AB9Omc7ZEL1VsDHKBtfat1Zi0mne1lRwzvbzApR0bW+A+/m/teNlbEME2rfAPRBS5 cqW+YEAlBiZhOBEkOSsksA/UVZcfx2/KOU+wa32KGy1OudA39HPvIg0ptkRyESGoo6Sp 8vlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2YgIsxhH4SyNOO1OygJR5Zoi6AMbZFUCPRnEytRovzU=; b=oIL/IBITCkWqCV+rY5bqWEBiW8/Yf7H/7uLP9S1D6o3leU6EG6Zjd5Iz1PtO7K/S87 yBV74i8wgm2VAi7VNzJ9vKMC6Y+c0kjGpsqgGGBQlUMwxLmaCxdYdq/rjBMS/Ea3JacE EQPslSspUZSoS9oP9qJef1mtLOMxEVEULjIq0PESxaPZ6jK+JW77O0JXZ+pe1XOlB5SI WHcIIDjTLAL/fnS43NsHVCjAyoRIaVickY6Jd4+MmATHmkFM0fPWmvrEpMIM50oaESpL UoOxZxsXomz3dsKGwSnDjeJXont+rCYPLLXVusRd3WyebkwhUdBbtQmYjsXudMfUTGeD MJLA== X-Gm-Message-State: AOAM530LlyV7oNWupcx0wBUAHqc8bsv+cq6mUOIBPRFn0moiOVvSccWN qzruNgBmpSUDmZfQTydBMg3BaQ== X-Received: by 2002:a05:6000:10d:: with SMTP id o13mr10867552wrx.88.1628259021414; Fri, 06 Aug 2021 07:10:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g198sm15215710wme.0.2021.08.06.07.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 07:10:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 11B4F1FF9B; Fri, 6 Aug 2021 15:10:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/4] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them Date: Fri, 6 Aug 2021 15:10:15 +0100 Message-Id: <20210806141015.2487502-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806141015.2487502-1-alex.bennee@linaro.org> References: <20210806141015.2487502-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The patch that recently introduced the S390X_RUNNER_AVAILABLE variable in custom-runners.yml missed that the bottom half of the file is rather about aarch64 than s390x. Thus rename the S390X_RUNNER_AVAILABLE to AARCH64_RUNNER_AVAILABLE in those jobs. Finally mention both variables in our CI documentation, too. Fixes: c5dd0f0342 ("Improve rules for the staging branch") Signed-off-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210730143809.717079-4-thuth@redhat.com> Signed-off-by: Alex Bennée --- docs/devel/ci.rst | 13 +++++++++++++ .gitlab-ci.d/custom-runners.yml | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index 205572510c..558327457c 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -48,6 +48,19 @@ these artifacts are not already cached, downloading them make the jobs reach the timeout limit). Set this variable to have the tests using the Avocado framework run automatically. +AARCH64_RUNNER_AVAILABLE +~~~~~~~~~~~~~~~~~~~~~~~~ +If you've got access to an aarch64 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 "aarch64". + +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". + + Jobs on Custom Runners ====================== diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 564b94565d..0d3e4a7b4b 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -137,7 +137,7 @@ ubuntu-20.04-aarch64-all-linux-static: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - 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 @@ -157,7 +157,7 @@ ubuntu-20.04-aarch64-all: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -174,7 +174,7 @@ ubuntu-20.04-aarch64-alldbg: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -193,7 +193,7 @@ ubuntu-20.04-aarch64-clang: rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" when: manual script: - mkdir build @@ -211,7 +211,7 @@ ubuntu-20.04-aarch64-tci: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" script: - mkdir build - cd build @@ -228,7 +228,7 @@ ubuntu-20.04-aarch64-notcg: rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual - - if: "$S390X_RUNNER_AVAILABLE" + - if: "$AARCH64_RUNNER_AVAILABLE" when: manual script: - mkdir build