Merge pull request #5 from bacpop/bacpop-159-v8-db-deploy

Bacpop-159 v8 db update

config/beebop.yml

@@ -21,8 +21,7 @@ api:
     repo: mrcide
     name: beebop-py
     tag: main
-  db_location: ./storage/GPS_v6_references
-  use_small_db: true
+  db_location: ./storage/GPS_v8_ref
   storage_location: ./storage
 redis:
   image:

config/prod.yml

@@ -19,7 +19,6 @@ vault:
   auth:
     method: github
 api:
-  db_location: ./storage/GPS_v6
-  use_small_db: false
+  db_location: ./storage/GPS_v8_ref
 worker:
   count: 5

src/beebop_deploy.py

@@ -102,8 +102,6 @@ def __init__(self, path, config_name=None, options=None):
         self.api_db_location = config.config_string(
             dat, ["api", "db_location"])
         self.api_db_name = os.path.basename(self.api_db_location)
-        self.api_use_small_db = config.config_boolean(
-            dat, ["api", "use_small_db"])
 
         # worker and api always the same image
         self.worker_ref = constellation.ImageReference(
@@ -176,9 +174,6 @@ def api_configure(container, cfg):
     else:
         print("[api] Downloading storage database")
         args = ["./scripts/download_db"]
-        if cfg.api_use_small_db:
-            args = args + ["--small"]
-        args = args + ["storage"]
         mounts = [docker.types.Mount("/beebop/storage",
                   cfg.volumes["storage"])]
         container.client.containers.run(str(cfg.api_ref), args, mounts=mounts,

test/test_integration.py

@@ -14,6 +14,14 @@ def test_start_beebop():
     obj.status()
     obj.start()
 
+    assert docker_util.network_exists("beebop_nw")
+    assert docker_util.volume_exists("beebop_storage")
+    assert docker_util.container_exists("beebop-api")
+    assert docker_util.container_exists("beebop-redis")
+    assert docker_util.container_exists("beebop-server")
+    assert docker_util.container_exists("beebop-proxy")
+    assert len(docker_util.containers_matching("beebop-worker-", False)) == 2
+
     # ignore SSL
     session = requests.Session()
     session.verify = False
@@ -24,14 +32,6 @@ def test_start_beebop():
     assert res.status_code == 200
     assert json.loads(res.content)["message"] == "Welcome to beebop!"
 
-    assert docker_util.network_exists("beebop_nw")
-    assert docker_util.volume_exists("beebop_storage")
-    assert docker_util.container_exists("beebop-api")
-    assert docker_util.container_exists("beebop-redis")
-    assert docker_util.container_exists("beebop-server")
-    assert docker_util.container_exists("beebop-proxy")
-    assert len(docker_util.containers_matching("beebop-worker-", False)) == 2
-
     obj.destroy()
 
     assert not docker_util.network_exists("beebop_nw")