Fix up conditional docker and artifact publish commands

Author: Bhavik Kumar

.travis.yml

@@ -61,8 +61,8 @@ jobs:
     - eval $(aws sts assume-role --role-arn "$OPERATIONS_ROLE_ARN" --role-session-name "${TRAVIS_REPO_SLUG//\//-}" | jq -r '.Credentials | @sh "export AWS_SESSION_TOKEN=\(.SessionToken)\nexport AWS_ACCESS_KEY_ID=\(.AccessKeyId)\nexport AWS_SECRET_ACCESS_KEY=\(.SecretAccessKey) "')
     - $(aws ecr get-login --no-include-email --region $AWS_DEFAULT_REGION)
     - ./gradlew check docker dockerTag -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI
-    - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew dockerTagsPush publish; fi
-    - if [ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" = "master" ]; then bash ./gradlew dockerPush; fi
+    - if [ "TRAVIS_EVENT_TYPE" = "push" ]; then bash ./gradlew dockerTagsPush publish; fi
+    - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./gradlew dockerPush; fi
     after_success:
     - ./gradlew sonarqube
   - stage: deploy to development