Merge branch 'master' into rabbitmq-host-optional

.travis.yml

@@ -19,22 +19,6 @@ after_success:
   Skipping docker push."; exit 0; fi;
 - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS;
 - "./scripts/push.sh"
-before_deploy:
-- eval "$(ssh-agent -s)"
-- chmod 600 $TRAVIS_BUILD_DIR/${REPO}_deploy_rsa
-- ssh-add $TRAVIS_BUILD_DIR/${REPO}_deploy_rsa
-before_install:
-- openssl aes-256-cbc -K $encrypted_b5c3402481e1_key -iv $encrypted_b5c3402481e1_iv
-  -in shipping_deploy_rsa.enc -out shipping_deploy_rsa -d
-addons:
-  ssh_known_hosts: "$BASTION"
-deploy:
-  provider: script
-  skip_cleanup: true
-  script: ssh -o StrictHostKeyChecking=no $BASTION_USER@$BASTION ./deploy.sh ${REPO}
-    $COMMIT
-  on:
-    branch: master
 notifications:
   slack:
     secure: tns9qBsF5fcLCeBbMyYEtecnMEDGWVhjK3hD/O022v+4DgDn8r0ne29mK06jrUaJ7L6xSlwy79QAvTklY/sr0WjRRB0ka7btmNVwwYinn6VJYVkSA2Drl5Wbti/Jap9PtH2/GIgObqTlYPfeoDdkIxKS04PjSJTwG22g/AZsAzrIiZHT6rI19JIBrskmfQkPEQuBbfFlP/YDkBZQ2x7hMXuHrxrUbsVNAQ7kFlns7wzTzPpoy2tf8NcYZsh9I7j7YjTW5zwDQe86Yc+AaGuT84xGwt4CShycDQQ0Tck/vb+yT2+k3pB9Bx/p19iB7QJR3TxfLeDJ7F6Oh/PsD6irh3vSeWdqaK4dtSszzHY94ec7vFWE8k9tceJMqWMflPHPiJLV2MJ6kxrCbI6U4c0+HYQm0cGAp+QH9KRjVvosT1U2TiPDBTW028O7VV/BcuU+3FZzmZfF2JDCNPotTwsK0IVgEeaTlqkMYBy5zWN904wudctGCmJBlNMlAJaT7v0F4sE/3UKqVegbfhvFsCUlXMbATqAOaF5vM5DDT0b670jRcIyi9LL6X2z8oegV2xNbCLB2V52IdozTwA36sof4uHMZsy2yejm2c7/DTz0jlhoUjsSCr4/ZOAK36pJk94jeQyUc858ygq0eK+TsR/xFdsZZTSLu0s0qwWbQn6jUvzk=

scripts/push.sh

@@ -40,12 +40,9 @@ tag_and_push_all() {
     done;
 }
 
-# Always push commit
-tag_and_push_all $COMMIT
-
 # Push snapshot when in master
-if [ "$TRAVIS_BRANCH" == "master" ]; then
-    tag_and_push_all snapshot
+if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    tag_and_push_all master-${COMMIT:0:8}
 fi;
 
 # Push tag and latest when tagged