Merge branch 'travis_ci_fixes'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

.travis.yml

@@ -32,35 +32,4 @@ install:
     - pip install -r requirements-selftests.txt
 
 script:
-    - |
-        # First cleanup the previously installed files
-        PYTHON=$(which python)
-        $(PYTHON) setup.py develop --uninstall
-        BINDIR=$(dirname $(which python))
-        for FILE in scripts/*; do
-            rm $BINDIR/$(basename $FILE)
-        done
-        # Run the "make check" per each commit in PR (TRAVIS_COMMIT_RANGE)
-        ERR=""
-        echo Branch is $TRAVIS_BRANCH
-        if [ "$TRAVIS_PULL_REQUEST_SHA" ]; then
-            # It's pull request, check only PR commits
-            COMMITS="$(git cherry origin/master | sed -n 's/+ \(.*\)/\1/p')"
-        else
-            # push check, try to check everything
-            COMMITS=$(git rev-list $TRAVIS_COMMIT_RANGE)
-        fi
-        for COMMIT in $COMMITS; do
-            echo
-            echo "--------------------< $(git log -1 --oneline $COMMIT) >--------------------"
-            echo
-            echo
-            git checkout $COMMIT || ERR=$(echo -e "$ERR\nUnable to checkout $(git log -1 --oneline $COMMIT)")
-            make PYTHON=$PYTHON check || ERR=$(echo -e "$ERR\nmake check of $(git log -1 --oneline) failed")
-            make PYTHON=$PYTHON clean
-        done
-        if [ "$ERR" ]; then
-            echo
-            echo "Incremental smokecheck failed: $ERR"
-            exit -1
-        fi
+    - make check

selftests/signedoff-check.sh

 #!/bin/sh -e
 
-AUTHOR="$(git log -1 --pretty='format:%aN <%aE>')"
-git log -1 --pretty=format:%B | grep "Signed-off-by: $AUTHOR"
+AUTHOR="$(git log --no-merges -1 --pretty='format:%aN <%aE>')"
+git log --no-merges -1 --pretty=format:%B | grep "Signed-off-by: $AUTHOR"
 if [ $? != 0 ]; then
     echo "The commit message does not contain author's signature (Signed-off-by: $AUTHOR)"
-    return 1
+    exit 1
 fi