circleci: attempt to work around wrong branch checked out during integration tests
@@ -142,12 +142,18 @@ jobs:
mkdir -p /tmp/test-results
nohup ./bin/start-server -s > /tmp/test-results/killbill.log 2>&1 &
+ # Get rid of message "Warning: Permanently added the RSA host key for IP address..." further down
+ ssh git@github.com || true
+
mkdir -p /home/killbill/killbill-integration-tests
git clone https://github.com/killbill/killbill-integration-tests.git /home/killbill/killbill-integration-tests
pushd /home/killbill/killbill-integration-tests
if [ "${CIRCLE_BRANCH}" != "master" ]; then
if [ -n "$(git ls-remote --heads https://github.com/killbill/killbill-integration-tests.git ${CIRCLE_BRANCH})" ]; then
+ echo "Switching to branch ${CIRCLE_BRANCH}"
git checkout -b ${CIRCLE_BRANCH} origin/${CIRCLE_BRANCH}
+ else
+ echo "killbill-integration-tests doesn't have a branch ${CIRCLE_BRANCH}, staying on master"
fi
fi
source /usr/share/rvm/scripts/rvm
@@ -166,7 +172,7 @@ jobs:
done
set -e
- bundle exec rake test:core | tee /tmp/test-results/test.txt 2>&1
+ bundle exec rake ci:core | tee /tmp/test-results/test.txt 2>&1
- store_test_results:
path: test/reports/
- store_artifacts:
