From patchwork Fri Sep 3 09:03:21 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: 506480 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp824271jai; Fri, 3 Sep 2021 02:09:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd7ip1T8UFo9gZazWwY7sgDxCvan5YGNj1Pfc6r3+uyyhvt92bcptVjVyw5I58ovxGOhV7 X-Received: by 2002:a67:c381:: with SMTP id s1mr1848663vsj.24.1630660175299; Fri, 03 Sep 2021 02:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630660175; cv=none; d=google.com; s=arc-20160816; b=XZsG3ME2n6BaphVa/LZfdHCx5gdUlG2VGCElyrvo9cStxUCeCArIXVRnCplWYJYX+Y oTLLkYKnItefU1qT1rNJ8/nPPRT4vw/gsCAW52q215a9nKMKKJ8OOD+Vg88YRVgPJmky NuhfMRNWqMoLJ3aMHLarXDIv3fh0BVl40Ux3HmxPsXXBqkpHf22hLSkps0DF7wWl4Nns cuFH32mzwxYrh3w8Z6Hj0TaheTdRiAi/L9uOFliqxowEIxr0USjjq3tCmi4i3XyGQPnB ooRG/HSEMlWTRgx7/Unjnd23rT1DnD+h3VPAiYJ8+4Puj3+HYK3ub36s+ktZEyE5gwfi yKxA== 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=KKnSH+lDAvOjNQH8hqEes6n/qTsZNa6jN/zhCFc0/UU=; b=h6hEKj8nWzFr51FBe+RHX4zMjzIdtfw/PpqbGJc5ql9NyZ2JCxg6x0cbz3TiQdgMdy MKNyxhEX6s89qYv9YTNHoojXlMJbisW77q6+cYamNDzIu2muXZJ6mq2ceFya9DDh3xP3 j5knPVUZJDvSpjKhguwNkwB1cTfTcP2hsADSyel0iisSAKJ0/cHfo7HISxjqPmpVnV1N ITMeG0hQotgdStYorjwSNB2wSGs3YeN+oOGTRUiYCBkRejyBEA4nvntaBvXs9s7pre2U 6WOlxoXbzx319KoB9NhCehSNHlRSnknhmqmZqZaTq20DOP2mQzqdQ/yjk2lrl3iT91ml f5xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vXdQPPqD; 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 x8si2150000uae.21.2021.09.03.02.09.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Sep 2021 02:09:35 -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=vXdQPPqD; 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]:44222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM5CY-0004Hk-JS for patch@linaro.org; Fri, 03 Sep 2021 05:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM572-00064M-GA for qemu-devel@nongnu.org; Fri, 03 Sep 2021 05:03:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:36732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mM56z-0005ZD-Hr for qemu-devel@nongnu.org; Fri, 03 Sep 2021 05:03:51 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q14so7179459wrp.3 for ; Fri, 03 Sep 2021 02:03:49 -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=KKnSH+lDAvOjNQH8hqEes6n/qTsZNa6jN/zhCFc0/UU=; b=vXdQPPqDZHGgSouXUOEDrFpLo5Q8vV7kwTuyDcHJC6uIg5Gb353k4LrimZlUFoYvN5 GJ/fl5h8zrdM9k5ozT/kXF17nQHbg4Qmj/r9nq9jI+uvnX5Z8UDNQjp1nPhjJBmdGbyg Mcv7milvUFxclkPsrK1Eavu2DH9y2JWMaLw++T5fZJ/mVrw95aKc7J7SrVJWJFkjYuhq IYaseP3aODtsKBIW7A2p6/0rgpUwySq5tHh/rYSmK9+Jg+XJbjMAOOulqfq700vp/X9E 9z1mwjr7qIt6MgoWV1gsFgxyoD3g2CbON26YpQKkVihZIsw9qtt4JefoOERMC/1p6XQd y00w== 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=KKnSH+lDAvOjNQH8hqEes6n/qTsZNa6jN/zhCFc0/UU=; b=SOLJiIc5Fi3Unqy+3DwC+sfV54HSX7kqz+KXgV247S45n+TY9P06XcMVD2OmGj6R8s EcfZ0XtdOKY838iyDhGc7titWHVdmh4BEgOIrRtrIlepW1GJv8QCoLIyi4M35/LdoVs4 HZzL84VL5rjCaiGuJFsObuKpMnbgVQgWKBu1x/mH789c6auz4S+fN7J1+lDCL9tBVJK5 /6L3Up72AhRD9B6oA2NLl4JtNYKTX7vCUzYezezNm/a7dxGb5sFXJPReph+oQHOejthJ FA9NUjcu5BEkV7XN2WnsnVNVI8NUcdJQNV12Cla9qpLm0u/dPyz74IEp6jHzHH2balCW WrjA== X-Gm-Message-State: AOAM532wYWh5alVdsgIgkiGZFmJ+Y4baJWB6tsUs1McyNZ+4ok2guWOD 7WCRR0ggW0jeXNq9oOJ3qEaL9Q== X-Received: by 2002:adf:9f0c:: with SMTP id l12mr2940227wrf.146.1630659828175; Fri, 03 Sep 2021 02:03:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm4189745wrr.58.2021.09.03.02.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 02:03:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 340D01FF9B; Fri, 3 Sep 2021 10:03:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/22] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them Date: Fri, 3 Sep 2021 10:03:21 +0100 Message-Id: <20210903090339.1074887-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903090339.1074887-1-alex.bennee@linaro.org> References: <20210903090339.1074887-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_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: 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> [AJB: moved due to docu changes] Signed-off-by: Alex Bennée Message-Id: <20210806141015.2487502-5-alex.bennee@linaro.org> -- 2.30.2 diff --git a/docs/devel/ci-jobs.rst b/docs/devel/ci-jobs.rst index 9cd9819786..277975e4ad 100644 --- a/docs/devel/ci-jobs.rst +++ b/docs/devel/ci-jobs.rst @@ -38,3 +38,14 @@ 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". 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