Skip to content

Commit

Permalink
Merge pull request #3150 from ohsu-comp-bio/funnel-version
Browse files Browse the repository at this point in the history
[TES Backend] run centaur tests against Funnel version 0.5.0
  • Loading branch information
kshakir committed Jan 18, 2018
2 parents 1f831bc + 9af0335 commit 1a42976
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
29 changes: 13 additions & 16 deletions src/bin/travis/resources/funnel.conf
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
Server:
HTTPPort: 9000
Database: boltdb
Databases:
BoltDB:
Path: /tmp/tes_task.db
Logger:
Level: info

Backend: local
Compute: local
Database: boltdb

Worker:
Storage:
Local:
AllowedDirs:
- /home/
- /cromwell-executions
- /tmp/
Logger:
Level: info
BoltDB:
Path: /tmp/tes_task.db

LocalStorage:
AllowedDirs:
- /home/
- /cromwell-executions
- /tmp/

Logger:
Level: info
4 changes: 2 additions & 2 deletions src/bin/travis/testCentaurTes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ CROMWELL_JAR=$(find "$(pwd)/target/scala-2.12" -name "cromwell-*.jar")
TES_CENTAUR_CONF="$(pwd)/src/bin/travis/resources/tes_centaur.conf"
FUNNEL_CONF="$(pwd)/src/bin/travis/resources/funnel.conf"

wget https://github.com/ohsu-comp-bio/funnel/releases/download/0.4.1/funnel-linux-amd64-0.4.1.tar.gz
tar xzf funnel-linux-amd64-0.4.1.tar.gz
wget https://github.com/ohsu-comp-bio/funnel/releases/download/0.5.0/funnel-linux-amd64-0.5.0.tar.gz
tar xzf funnel-linux-amd64-0.5.0.tar.gz
FUNNEL_PATH="$(pwd)/funnel"

mkdir logs
Expand Down

0 comments on commit 1a42976

Please sign in to comment.