Skip to content

Commit

Permalink
Merge pull request #240 from sylvinite/master
Browse files Browse the repository at this point in the history
Taca-ngi updates and STATUS_DB_CONFIG movement
  • Loading branch information
Johan Hermansson authored Jun 15, 2017
2 parents c2a2b36 + f43d713 commit c3b0473
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
5 changes: 0 additions & 5 deletions roles/multiqc/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
args:
chdir: "{{ multiqc_ngi_dest }}"

- name: Add statusDB envvar to sourceme
lineinfile: dest={{ ngi_pipeline_conf }}/{{ bash_env_script }}
line="export STATUS_DB_CONFIG={{ ngi_pipeline_conf }}/{{ statusdb_creds }}"
backup=no

- name: Deploy multiqc configs
template: src="multiqc_config.yml.j2" dest="{{ ngi_pipeline_conf }}/multiqc_{{ item.site }}_config.yml"
with_items:
Expand Down
8 changes: 0 additions & 8 deletions roles/ngi_reports/tasks/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,4 @@
- name: Install couchDB (minimal version of statusDB)
shell: "{{ ngi_pipeline_venv }}/bin/pip install couchdb"

- name: Copy statusDB credentials
copy: src="files/{{ statusdb_creds }}" dest="{{ ngi_pipeline_conf }}/{{ statusdb_creds }}"

- name: Add statusDB envvar to sourceme
lineinfile: dest={{ ngi_pipeline_conf }}/{{ bash_env_sthlm_script }}
line="export STATUS_DB_CONFIG={{ ngi_pipeline_conf }}/{{ statusdb_creds }}"
backup=no

###END STOCKHOLM SPECIFIC
2 changes: 1 addition & 1 deletion roles/taca/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
taca_ngi_repo: https://github.com/SciLifeLab/taca-ngi-pipeline.git
taca_ngi_dest: "{{ sw_path }}/taca-ngi-pipeline"
taca_ngi_version: fa4b2be41124b78dba6edeeac20ad230e67009b9
taca_ngi_version: 537fb597f813323a3dabac9f614b2f10ccd8aefb

statusdb_repo: "https://github.com/SciLifeLab/statusdb.git"
statusdb_dest: "{{ sw_path }}/statusdb"
Expand Down
8 changes: 8 additions & 0 deletions roles/taca/tasks/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
args:
chdir: "{{ statusdb_dest }}"

- name: Copy statusDB credentials
copy: src="files/{{ statusdb_creds }}" dest="{{ ngi_pipeline_conf }}/{{ statusdb_creds }}"

- name: Add statusDB envvar to sourceme
lineinfile: dest={{ ngi_pipeline_conf }}/{{ bash_env_sthlm_script }}
line="export STATUS_DB_CONFIG={{ ngi_pipeline_conf }}/{{ statusdb_creds }}"
backup=no

- name: Fetch flowcell_parser from GitHub
git: repo="{{ flowcell_parser_repo }}"
dest="{{ flowcell_parser_dest }}"
Expand Down

0 comments on commit c3b0473

Please sign in to comment.