Merge pull request #35 from lsst-sqre/tickets/DM-22649

[DM-22649] Make async bucket configurable
lsst-sqre · Dec 17, 2019 · b5a8933 · b5a8933
2 parents 31751ef + 5cce23e
commit b5a8933
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ before_script:
 
 script:
   - ./build.sh
-  - cd docker && docker-compose up -d && ./waitForContainersReady.sh && ./checkAvailability.sh
+  - ./test.sh
 
 after_success:
   - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}

diff --git a/src/main/java/org/opencadc/tap/impl/ResultStoreImpl.java b/src/main/java/org/opencadc/tap/impl/ResultStoreImpl.java
@@ -86,13 +86,14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.sql.ResultSet;
+import java.util.Properties;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class ResultStoreImpl implements ResultStore {
     private String filename;
-    private static final String bucket = "async-results.lsst.rocks";
-    private static final String bucketURL = "http://async-results.lsst.rocks";
+    private static final String bucket = System.getProperty("gcs_bucket");
+    private static final String bucketURL = System.getProperty("gcs_bucket_url");
 
 
     @Override

diff --git a/test.sh b/test.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -ex
+cd docker
+docker-compose up -d
+./waitForContainersReady.sh
+./checkAvailability.sh