diff --git a/.circleci/config.yml b/.circleci/config.yml index fe18aef5..a84d2bbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,20 +19,15 @@ jobs: auth: username: $DOCKER_USER password: $DOCKER_PASS - # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/postgres:9.4 - environment: PYTHON_BIN: /usr/local/bin/python2.7 - working_directory: ~/repo - steps: - checkout - - run: name: set version and build the rpm command: | @@ -46,17 +41,16 @@ jobs: git tag -a $(cat VERSION) -m "Tagged by ${CIRCLE_BUILD_URL}" HEAD rpm -qa | grep ssh rpm -ql libssh2-1.4.2-2.el6_7.1.x86_64 - git push --tags origin + + set -e + git push --tags origin -v || { echo "GIT PUSH FAILED"; exit 1; } mkdir mongodb_consistent_backup_rpm cp /root/repo/build/rpm/RPMS/x86_64/mongodb_consistent_backup-$(cat VERSION)-1.el6.x86_64.rpm mongodb_consistent_backup_rpm/ - - save_cache: paths: - ./venv key: v1-dependencies-{{ checksum "requirements.txt" }} - - store_artifacts: path: mongodb_consistent_backup_rpm destination: mongodb_consistent_backup - diff --git a/VERSION b/VERSION index 4ea2b1f4..ac9f79ca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.9 +1.4.10 diff --git a/mongodb_consistent_backup/Replication/__init__.py b/mongodb_consistent_backup/Replication/__init__.py index ae4d1189..d289a619 100644 --- a/mongodb_consistent_backup/Replication/__init__.py +++ b/mongodb_consistent_backup/Replication/__init__.py @@ -3,7 +3,7 @@ def config(parser): - parser.add_argument("--replication.max_lag_secs", dest="replication.max_lag_secs", default=10, type=int, + parser.add_argument("--replication.max_lag_secs", dest="replication.max_lag_secs", default=20, type=int, help="Max lag of backup replica(s) in seconds (default: 10)") parser.add_argument("--replication.min_priority", dest="replication.min_priority", default=0, type=int, help="Min priority of secondary members for backup (default: 0)")