From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Willian Rampazzo" <willianr@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 7/9] gitlab-ci.d/custom-runners: Improve rules for the staging branch
Date: Thu, 29 Jul 2021 10:22:09 +0200 [thread overview]
Message-ID: <20210729082211.532572-8-thuth@redhat.com> (raw)
In-Reply-To: <20210729082211.532572-1-thuth@redhat.com>
If maintainers are currently pushing to a branch called "staging"
in their repository, they are ending up with some stuck jobs - unless
they have a s390x CI runner machine available. That's ugly, we should
make sure that the related jobs are really only started if such a
runner is available. So let's only run these jobs if it's the
"staging" branch of the main repository of the QEMU project (where
we can be sure that the s390x runner is available), or if the user
explicitly set a S390X_RUNNER_AVAILABLE variable in their CI configs
to declare that they have such a runner available, too.
Fixes: 4799c21023 ("Jobs based on custom runners: add job definitions ...")
Message-Id: <20210728173857.497523-1-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 | 40 +++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 061d3cdfed..564b94565d 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -24,7 +24,8 @@ ubuntu-18.04-s390x-all-linux-static:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_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
@@ -43,7 +44,8 @@ ubuntu-18.04-s390x-all:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -59,7 +61,8 @@ ubuntu-18.04-s390x-alldbg:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -76,7 +79,9 @@ ubuntu-18.04-s390x-clang:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
+ - if: "$S390X_RUNNER_AVAILABLE"
when: manual
script:
- mkdir build
@@ -93,7 +98,8 @@ ubuntu-18.04-s390x-tci:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -108,7 +114,9 @@ ubuntu-18.04-s390x-notcg:
- ubuntu_18.04
- s390x
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
+ - if: "$S390X_RUNNER_AVAILABLE"
when: manual
script:
- mkdir build
@@ -128,7 +136,8 @@ ubuntu-20.04-aarch64-all-linux-static:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_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
@@ -147,7 +156,8 @@ ubuntu-20.04-aarch64-all:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -163,7 +173,8 @@ ubuntu-20.04-aarch64-alldbg:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -180,7 +191,9 @@ ubuntu-20.04-aarch64-clang:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
+ - if: "$S390X_RUNNER_AVAILABLE"
when: manual
script:
- mkdir build
@@ -197,7 +210,8 @@ ubuntu-20.04-aarch64-tci:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ - if: "$S390X_RUNNER_AVAILABLE"
script:
- mkdir build
- cd build
@@ -212,7 +226,9 @@ ubuntu-20.04-aarch64-notcg:
- ubuntu_20.04
- aarch64
rules:
- - if: '$CI_COMMIT_BRANCH =~ /^staging/'
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
+ - if: "$S390X_RUNNER_AVAILABLE"
when: manual
script:
- mkdir build
--
2.27.0
next prev parent reply other threads:[~2021-07-29 8:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 8:22 [PULL 0/9] Gitlab-CI improvements and some other fixes Thomas Huth
2021-07-29 8:22 ` [PULL 1/9] docs: Document GitLab custom CI/CD variables Thomas Huth
2021-07-29 8:22 ` [PULL 2/9] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template Thomas Huth
2021-07-29 8:22 ` [PULL 3/9] gitlab-ci: Fix 'when:' condition in EDK2 jobs Thomas Huth
2021-07-29 8:22 ` [PULL 4/9] gitlab-ci: Fix 'when:' condition in OpenSBI jobs Thomas Huth
2021-07-29 8:22 ` [PULL 5/9] gitlab-ci.d/buildtest: Disable iotests 197 and 215 Thomas Huth
2021-07-29 8:22 ` [PULL 6/9] gitlab-ci.d/buildtest: Mark the aarch64 and ppc64-s390x CFI jobs as manual Thomas Huth
2021-07-29 8:22 ` Thomas Huth [this message]
2021-07-29 8:22 ` [PULL 8/9] tests: Fix migration-test build failure for sparc Thomas Huth
2021-07-29 9:42 ` Philippe Mathieu-Daudé
2021-07-29 8:22 ` [PULL 9/9] configure script fix for Haiku Thomas Huth
2021-07-29 15:06 ` [PULL 0/9] Gitlab-CI improvements and some other fixes Peter Maydell
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=20210729082211.532572-8-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.