---

aozarov · aozarov · commit 0ff2c731aa1e · 2015-10-08T17:03:37.000-07:00
yaml --- r: 6241 b: refs/heads/tswast-patch-1 c: 8310e70 h: refs/heads/master i: 6239: 02ea542
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
+refs/heads/tswast-patch-1: 8310e70a70cce8ea3d39135177d1934037c30f62
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/RemoteGcsHelper.java
@@ -50,7 +50,6 @@ public class RemoteGcsHelper {
   private static final String BUCKET_NAME_PREFIX = "gcloud-test-bucket-temp-";
   private static final String PROJECT_ID_ENV_VAR = "GCLOUD_TESTS_PROJECT_ID";
   private static final String PRIVATE_KEY_ENV_VAR = "GCLOUD_TESTS_KEY";
-
   private final StorageOptions options;
 
   private RemoteGcsHelper(StorageOptions options) {
@@ -127,7 +126,13 @@ public static RemoteGcsHelper create(String projectId, String keyPath, Option...
       StorageOptions storageOptions = StorageOptions.builder()
           .authCredentials(AuthCredentials.createForJson(keyFileStream))
           .projectId(projectId)
-          .retryParams(RetryParams.getDefaultInstance())
+          .retryParams(RetryParams.builder()
+              .retryMaxAttempts(10)
+              .retryMinAttempts(6)
+              .maxRetryDelayMillis(30000)
+              .totalRetryPeriodMillis(120000)
+              .initialRetryDelayMillis(250)
+              .build())
           .build();
       return new RemoteGcsHelper(storageOptions);
     } catch (FileNotFoundException ex) {
diff --git a/branches/tswast-patch-1/utilities/after_success.sh b/branches/tswast-patch-1/utilities/after_success.sh
@@ -30,7 +30,7 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
 
         cd ..
         utilities/update_docs_version.sh # Update version in READMEs
-        mvn deploy --settings target/travis/settings.xml -P sign-deploy
+        mvn deploy -DskipTests=true --settings target/travis/settings.xml -P sign-deploy
     else
         mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
     fi
