From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org
Cc: "Willian Rampazzo" <willianr@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: Re: [PATCH 3/3] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them
Date: Fri, 30 Jul 2021 16:52:47 +0200 [thread overview]
Message-ID: <acf78e95-8e90-4a6e-18e8-0d1707431604@redhat.com> (raw)
In-Reply-To: <20210730143809.717079-4-thuth@redhat.com>
On 7/30/21 4:38 PM, Thomas Huth wrote:
> 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.
Oops.
> Finally mention both variables in our CI documentation, too.
Thanks.
Maybe "Fix ${arch}_RUNNER_AVAILABLE" as subject.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Fixes: c5dd0f0342 ("Improve rules for the staging branch")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> .gitlab-ci.d/custom-runners.yml | 12 ++++++------
> docs/devel/ci.rst | 13 +++++++++++++
> 2 files changed, 19 insertions(+), 6 deletions(-)
>
> 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
> 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
> ======================
>
>
next prev parent reply other threads:[~2021-07-30 14:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 14:38 [PATCH 0/3] Gitlab-CI improvements Thomas Huth
2021-07-30 14:38 ` [PATCH 1/3] gitlab-ci: Merge "build-disabled" with "build-without-default-features" Thomas Huth
2021-08-03 15:08 ` Willian Rampazzo
2021-07-30 14:38 ` [PATCH 2/3] gitlab-ci: Remove superfluous "dnf install" statement Thomas Huth
2021-08-03 15:08 ` Willian Rampazzo
2021-07-30 14:38 ` [PATCH 3/3] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them Thomas Huth
2021-07-30 14:52 ` Philippe Mathieu-Daudé [this message]
2021-08-03 15:10 ` Willian Rampazzo
2021-08-03 22:08 ` [PATCH 0/3] Gitlab-CI improvements Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=acf78e95-8e90-4a6e-18e8-0d1707431604@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).