From 3d0395d448f98f5d176c3904a0001f888da7fbc7 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 25 May 2020 17:32:27 +0200 Subject: [PATCH] ci: require ci/centos/containerized-tests for merging The ci/centos/containerized-tests status is already set by the Jenkins job in the CentOS CI. It can now be used to gate the automatic merging of PRs. Reduce the load on Travis CI, do not run the containerized-tests job there any longer. Signed-off-by: Niels de Vos --- .mergify.yml | 2 ++ .travis.yml | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 0e69730f6..63b883dfc 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -23,6 +23,7 @@ pull_request_rules: - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "status-success=continuous-integration/travis-ci/pr" + - "status-success=ci/centos/containerized-tests" - "status-success=DCO" - "status-success=commitlint" actions: @@ -40,6 +41,7 @@ pull_request_rules: - "#approved-reviews-by>=1" - "#changes-requested-reviews-by=0" - "status-success=continuous-integration/travis-ci/pr" + - "status-success=ci/centos/containerized-tests" - "status-success=DCO" - "status-success=commitlint" actions: diff --git a/.travis.yml b/.travis.yml index 1255377bc..598ed5ed3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,12 +91,6 @@ jobs: script: - ./scripts/build-multi-arch-image.sh || travis_terminate 1; - - stage: build testing - name: containerized test (Fedora) and build (CentOS) - script: - - make containerized-test || travis_terminate 1; - - make containerized-build || travis_terminate 1; - - stage: build testing name: cephcsi on Arm64 arch: arm64