Merge lp:~verterok/charms/trusty/conn-check/xenial-support-take2 into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

Proposed by Guillermo Gonzalez on 2017-01-16
Status: Merged
Approved by: Guillermo Gonzalez on 2017-01-16
Approved revision: 57
Merged at revision: 55
Proposed branch: lp:~verterok/charms/trusty/conn-check/xenial-support-take2
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 17 lines (+6/-1)
1 file modified
playbook.yaml (+6/-1)
To merge this branch: bzr merge lp:~verterok/charms/trusty/conn-check/xenial-support-take2
Reviewer Review Type Date Requested Status
Simon Davy 2017-01-16 Approve on 2017-01-16
Review via email: mp+314855@code.launchpad.net

Commit message

use --no-download arg when creating virtualenv if not in trusty

Description of the change

use --no-download arg when creating virtualenv if not in trusty

To post a comment you must log in.
Simon Davy (bloodearnest) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playbook.yaml'
2--- playbook.yaml 2016-12-20 13:53:59 +0000
3+++ playbook.yaml 2017-01-16 16:00:43 +0000
4@@ -69,7 +69,12 @@
5 - "{% if revision != 'head' -%} -r tag:conn-check-r{{ revision }} {%- endif %}"
6 when: not wheels_path_stat.stat.exists
7
8- - name: install conn-check
9+ - name: create virtualenv (only if not in trusty)
10+ tags: config-changed
11+ command: virtualenv --no-download {{ current_dir }} creates="{{ current_dir }}"
12+ when: ansible_distribution_release != "trusty"
13+
14+ - name: install conn-check (only trusty)
15 tags: config-changed
16 pip:
17 extra_args: "--ignore-installed --no-index --find-links {{ wheels_dir }}/{{ revision }}"

Subscribers

People subscribed via source and target branches