Split tests into two CI jobs

.travis.yml

@@ -4,12 +4,20 @@ python: 3.6
 services:
     - docker
 
-before_install:
-    - docker-compose --version
-    - docker-compose up -d
-    - docker ps -a
+jobs:
+    include:
+        - name: "Trellis"
+          before_install:
+              - docker-compose --version
+              - docker-compose -f trellis-compose.yml up -d
+
+        - name: "Trellis-ext-db"
+          before_install:
+              - docker-compose --version
+              - docker-compose -f trellis-ext-db-compose.yml up -d
 
 script:
-    - python verify_running.py
-    - python setup.py test -a "--baseurl=http://localhost:8080/"
-    - python setup.py test -a "--baseurl=http://localhost/"
+  - docker ps -a
+  - python verify_running.py --baseurl http://localhost/
+  - python setup.py test -a "--baseurl=http://localhost/"
+

trellis-compose.yml

@@ -0,0 +1,7 @@
+version: "3"
+services:
+  trellis:
+    image: trellisldp/trellis:latest
+    ports:
+      - 80:8080
+

docker-compose.yml → trellis-ext-db-compose.yml

@@ -1,9 +1,5 @@
 version: "3"
 services:
-  trellis:
-    image: trellisldp/trellis:latest
-    ports:
-      - 8080:8080
   trellis-db:
     image: trellisldp/trellis-ext-db:latest
     environment:

verify_running.py

@@ -1,5 +1,6 @@
-import requests
+import argparse
 import backoff
+import requests
 
 @backoff.on_exception(backoff.expo,
         requests.exceptions.RequestException,
@@ -8,5 +9,8 @@ def get_url(url):
     return requests.get(url)
 
 if __name__ == "__main__":
-    get_url("http://localhost/")
-    get_url("http://localhost:8080/")
+    parser = argparse.ArgumentParser(description="Check a webhost")
+    parser.add_argument("--baseurl", default="http://localhost/")
+
+    args = parser.parse_args()
+    get_url(args.baseurl)