[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/13] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document
From: |
Thomas Huth |
Subject: |
[PULL 05/13] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them |
Date: |
Thu, 2 Sep 2021 14:49:03 +0200 |
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")
Message-Id: <20210730143809.717079-4-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/custom-runners.yml | 12 ++++++------
docs/devel/ci-jobs.rst | 11 +++++++++++
2 files changed, 17 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-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".
--
2.27.0
- [PULL 00/13] Testing, build system and misc patches, Thomas Huth, 2021/09/02
- [PULL 02/13] libqtest: check for g_setenv() failure, Thomas Huth, 2021/09/02
- [PULL 04/13] gitlab-ci: Remove superfluous "dnf install" statement, Thomas Huth, 2021/09/02
- [PULL 03/13] gitlab-ci: Merge "build-disabled" with "build-without-default-features", Thomas Huth, 2021/09/02
- [PULL 01/13] docs: add definitions of terms for CI/testing, Thomas Huth, 2021/09/02
- [PULL 08/13] meson.build: Don't use internal libfdt if the user requested the system libfdt, Thomas Huth, 2021/09/02
- [PULL 06/13] gitlab-ci: Don't try to use the system libfdt in the debian job, Thomas Huth, 2021/09/02
- [PULL 05/13] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them,
Thomas Huth <=
- [PULL 07/13] meson.build: Fix the check for a usable libfdt, Thomas Huth, 2021/09/02
- [PULL 11/13] softmmu/vl: Add a "grab-mod" parameter to the -display sdl option, Thomas Huth, 2021/09/02
- [PULL 12/13] softmmu/vl: Deprecate the old grab options, Thomas Huth, 2021/09/02
- [PULL 09/13] configure / meson: Move the GBM handling to meson.build, Thomas Huth, 2021/09/02
- [PULL 13/13] softmmu/vl: Deprecate the -sdl and -curses option, Thomas Huth, 2021/09/02
- [PULL 10/13] scripts: Remove the "show-fixed-bugs.sh" file, Thomas Huth, 2021/09/02
- Re: [PULL 00/13] Testing, build system and misc patches, Peter Maydell, 2021/09/03