From b60927da0dc97d671669be59fd4fc658027fabca Mon Sep 17 00:00:00 2001 From: Andrea Hoffer Date: Tue, 22 Mar 2022 11:47:18 -0400 Subject: [PATCH] Disabling automerging of PRs by the openshift-cherrypick-robot --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6baedea5e..a162179f0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python cache: pip -env: - - PR_AUTHOR=${TRAVIS_PULL_REQUEST_SLUG::-15} +# env: +# - PR_AUTHOR=${TRAVIS_PULL_REQUEST_SLUG::-15} jobs: include: @@ -34,10 +34,11 @@ jobs: - pip3 install aura.tar.gz script: - python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch && python3 makeBuild.py - - stage: automerge - if: env(PR_AUTHOR)=openshift-cherrypick-robot - script: bash ./automerge.sh + # Commenting out to disable auto-merging of PRs + # - stage: automerge + # if: env(PR_AUTHOR)=openshift-cherrypick-robot + # script: bash ./automerge.sh stages: - build - - automerge + # - automerge