From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 13 Nov 2019 17:14:16 +0000 (-0500)
Subject: ceph-ansible-prs: update docs skip condition
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=151abb533c7e0039202ac1cb634a7ba729563424;p=ceph-build.git

ceph-ansible-prs: update docs skip condition

When a PR can't be merged due to conflicts then we can't check if the
last commit is a merge commit.

Commit message: "Merge xxxx into xxxx"

In this case we only checkout the latest commit in the PR without the
previous one if any.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 438296864..bc735a115 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -161,10 +161,13 @@
             #!/bin/bash
             # Returns 1 if only .rst and README files were modified
             echo "Checking if only rst and READMEs were modified"
-            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -v '\.rst\|README'
-            if [ $? -eq 1 ]; then
-              echo "Only docs were modified.  Skipping the rest of the job."
-              exit 1
+            git show HEAD | grep -qo ^Merge:
+            if [ $? -eq 0 ]; then
+              git diff --name-only $(git show HEAD | grep ^Merge: | cut -d ':' -f2) | grep -v '\.rst\|README'
+              if [ $? -eq 1 ]; then
+                echo "Only docs were modified.  Skipping the rest of the job."
+                exit 1
+              fi
             fi
           on-evaluation-failure: dont-run
           steps:
@@ -256,10 +259,13 @@
             #!/bin/bash
             # Returns 1 if only .rst and README files were modified
             echo "Checking if only rst and READMEs were modified"
-            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -v '\.rst\|README'
-            if [ $? -eq 1 ]; then
-              echo "Only docs were modified.  Skipping the rest of the job."
-              exit 1
+            git show HEAD | grep -qo ^Merge:
+            if [ $? -eq 0 ]; then
+              git diff --name-only $(git show HEAD | grep ^Merge: | cut -d ':' -f2) | grep -v '\.rst\|README'
+              if [ $? -eq 1 ]; then
+                echo "Only docs were modified.  Skipping the rest of the job."
+                exit 1
+              fi
             fi
           on-evaluation-failure: dont-run
           steps:
@@ -351,10 +357,13 @@
             #!/bin/bash
             # Returns 1 if only .rst and README files were modified
             echo "Checking if only rst and READMEs were modified"
-            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -v '\.rst\|README'
-            if [ $? -eq 1 ]; then
-              echo "Only docs were modified.  Skipping the rest of the job."
-              exit 1
+            git show HEAD | grep -qo ^Merge:
+            if [ $? -eq 0 ]; then
+              git diff --name-only $(git show HEAD | grep ^Merge: | cut -d ':' -f2) | grep -v '\.rst\|README'
+              if [ $? -eq 1 ]; then
+                echo "Only docs were modified.  Skipping the rest of the job."
+                exit 1
+              fi
             fi
           on-evaluation-failure: dont-run
           steps: