From 5f806f2a055cc10fa2c4a2cc05f4f9ab4d0071ca Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 8 Oct 2019 14:17:45 -0400 Subject: [PATCH] mergify: Update condition on status success We don't have one global pipeline anymore reporting the jenkins job status. So we need to match the CI scenario name. This also add the Travis CI status as a condition. Signed-off-by: Dimitri Savineau --- .mergify.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 0e06e7ba8..2b532813b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -16,7 +16,8 @@ pull_request_rules: - author=mergify[bot] - base=stable-3.0 - label!=DNM - - 'status-success=Testing: ceph-ansible PR Pipeline' + - status-success~=^Testing:\s(centos|ubuntu)-(non_)?container-.* + - status-success=continuous-integration/travis-ci/pr actions: merge: method: rebase @@ -29,7 +30,8 @@ pull_request_rules: - author=mergify[bot] - base=stable-3.1 - label!=DNM - - 'status-success=Testing: ceph-ansible PR Pipeline' + - status-success~=^Testing:\s(centos|ubuntu)-(non_)?container-.* + - status-success=continuous-integration/travis-ci/pr actions: merge: method: rebase @@ -42,7 +44,8 @@ pull_request_rules: - author=mergify[bot] - base=stable-3.2 - label!=DNM - - 'status-success=Testing: ceph-ansible PR Pipeline' + - status-success~=^Testing:\s(centos|ubuntu)-(non_)?container-.* + - status-success=continuous-integration/travis-ci/pr actions: merge: method: rebase @@ -55,7 +58,8 @@ pull_request_rules: - author=mergify[bot] - base=stable-4.0 - label!=DNM - - 'status-success=Testing: ceph-ansible PR Pipeline' + - status-success~=^Testing:\s(centos|ubuntu)-(non_)?container-.* + - status-success=continuous-integration/travis-ci/pr actions: merge: method: rebase -- 2.39.5