Do not fail post-merge jobs after force-push

Rebase happens in -sub branches regularly so these failures would
produce log noice.

(cherry picked from commit cbaf4fe6cd234da949c83894c197ceca92ac541b)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3cd485548520b82f7d9c887dea0198457312bb6..6a635f6825864154c9da092838720e4ba316b9c1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1984,7 +1984,7 @@ pairwise:
     - >
       echo "previous branch tip: $CI_COMMIT_BEFORE_SHA"
     - set +o pipefail; git log --format='%H' | grep --silent "$CI_COMMIT_BEFORE_SHA" && PREVIOUS_TIP_REACHABLE=1
-    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 1
+    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 0
     # non-fast-forward merges are disabled so we have to have merge commit on top
     - MERGE_REQUEST_ID="$(git log -1 --format='%b' | sed --silent -e "s|^See merge request ${CI_PROJECT_PATH}\!||p")"
     - >