In addition to not being triggered by schedule we should follow the same rules about QEMU_CI. One day we may figure out how to fold the custom runner rules into the .base_job_template but today is not that day.
Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- v3 - re-jigged to ensure staging still runs --- .gitlab-ci.d/custom-runners/debian-13-ppc64le.yml | 4 ++++ .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml | 4 ++++ .gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.gitlab-ci.d/custom-runners/debian-13-ppc64le.yml b/.gitlab-ci.d/custom-runners/debian-13-ppc64le.yml index 40b1f408f90..23b188dc72b 100644 --- a/.gitlab-ci.d/custom-runners/debian-13-ppc64le.yml +++ b/.gitlab-ci.d/custom-runners/debian-13-ppc64le.yml @@ -11,6 +11,10 @@ - ppc64le rules: - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /^staging/' + - if: '$QEMU_CI != "1" && $QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != $QEMU_CI_UPSTREAM' + when: never + - if: '$PPC64LE_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule" && $QEMU_CI == "1"' + when: manual - if: '$PPC64LE_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule"' before_script: - source scripts/ci/gitlab-ci-section diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml index c8adb8171c0..98d99193457 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml @@ -11,6 +11,10 @@ - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: '$QEMU_CI != "1" && $QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != $QEMU_CI_UPSTREAM' + when: never + - if: '$AARCH64_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule" && $QEMU_CI == "1"' + when: manual - if: '$AARCH64_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule"' before_script: - source scripts/ci/gitlab-ci-section diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml index fb093d05b5d..efa8252d948 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml @@ -11,6 +11,10 @@ - s390x rules: - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /^staging/' + - if: '$QEMU_CI != "1" && $QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != $QEMU_CI_UPSTREAM' + when: never + - if: '$S390X_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule" && $QEMU_CI == "1"' + when: manual - if: '$S390X_RUNNER_AVAILABLE && $CI_PIPELINE_SOURCE != "schedule"' before_script: - source scripts/ci/gitlab-ci-section -- 2.47.3
