| Message ID | 20210730143809.717079-4-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Gitlab-CI improvements | expand |
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 > ====================== > >
On Fri, Jul 30, 2021 at 11:38 AM Thomas Huth <thuth@redhat.com> 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. > > Finally mention both variables in our CI documentation, too. > > 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(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
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 ======================
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 <thuth@redhat.com> --- .gitlab-ci.d/custom-runners.yml | 12 ++++++------ docs/devel/ci.rst | 13 +++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-)