Merge pull request #339 from NBISweden/feature/no-fuse

Replacing FUSE with a notification system

.travis.yml

@@ -1,6 +1,12 @@
 language: python
 
 python: 3.6
+install:
+  - echo "Dependencies on Travis? No, thanks"
+
+git:
+  depth: false
+  quiet: true
 
 services: docker
 
@@ -22,8 +28,8 @@ jobs:
       script: tox
     - stage: integration tests
       before_script:
-        - cd deployments/docker
-        - make bootstrap ARGS="--inbox mina"
+        - cd docker
+        - make bootstrap ARGS='--inbox mina'
         - sudo chown -R travis private
         - docker network create cega
         - make up
@@ -34,8 +40,8 @@ jobs:
         - mvn test -Dtest=CommonTests -B
     - stage: integration tests
       before_script:
-        - cd deployments/docker
-        - make bootstrap ARGS="--inbox mina"
+        - cd docker
+        - make bootstrap ARGS='--inbox mina'
         - sudo chown -R travis private
         - docker network create cega
         - make up
@@ -44,6 +50,22 @@ jobs:
         - sleep 10
         - cd tests
         - mvn test -Dtest=RobustnessTests -B
+    - stage: integration tests
+      before_script:
+        - cd docker
+        - make bootstrap
+        - sudo chown -R travis private
+        - docker network create cega
+        - docker-compose up -d --scale ingest=3 --scale verify=5
+        - docker-compose ps
+      script:
+        - sleep 5
+        - pip install -r https://raw.githubusercontent.com/NBISweden/LocalEGA-cryptor/master/requirements.txt
+        - pip install git+https://github.com/NBISweden/LocalEGA-cryptor.git
+        - pip install pika
+        - make -C test
+        - sleep 10
+        - make -C test check
 
 notifications:
   email: false

README.md

@@ -8,7 +8,7 @@ The [code](lega) is written in Python (3.6+).
 
 You can provision and deploy the different components:
 
-* locally, using [docker-compose](deployments/docker).
+* locally, using [docker-compose](docker).
 * on an OpenStack cluster, using [terraform](https://github.com/NBISweden/LocalEGA-deploy-terraform).
 * on a Kubernetes/OpenShift cluster, using [kubernetes](https://github.com/NBISweden/LocalEGA-deploy-k8s)
 * on a Docker Swarm cluster, using [Gradle](https://github.com/NBISweden/LocalEGA-deploy-swarm)

deployments/docker/.gitignore → docker/.gitignore

@@ -2,4 +2,4 @@
 .env.201*
 private*
 .err
-!bootstrap/lib
+images/inbox/sftp-server.c*

deployments/docker/Makefile → docker/Makefile

@@ -10,9 +10,9 @@ private/cega.yml private/lega.yml private bootstrap:
 	@docker run --rm -it \
 		    -v /dev/urandom:/dev/random \
 		    -v ${PWD}:/ega \
-		    -v ${PWD}/../../extras/db.sql:/tmp/db.sql \
-		    -v ${PWD}/../../extras/generate_pgp_key.py:/tmp/generate_pgp_key.py \
-				-v ${PWD}/../../extras/rabbitmq_hash.py:/tmp/rabbitmq_hash.py \
+		    -v ${PWD}/../extras/db.sql:/tmp/db.sql \
+		    -v ${PWD}/../extras/generate_pgp_key.py:/tmp/generate_pgp_key.py \
+		    -v ${PWD}/../extras/rabbitmq_hash.py:/tmp/rabbitmq_hash.py \
 		    --entrypoint /ega/bootstrap/boot.sh \
 		    nbisweden/ega-base ${ARGS}