Skip to content

Commit

Permalink
Fix tests:
Browse files Browse the repository at this point in the history
Update the RethinkDB pubkey location and repo location based on their guide https://rethinkdb.com/docs/install/ubuntu/
Numpy has updated to no longer support 3.5, on 3.5, we should install a earlier version of Numpy to maintain compatibility.
  • Loading branch information
NGTmeaty authored Jun 2, 2020
1 parent 973af2c commit 25313a9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
18 changes: 17 additions & 1 deletion ansible/roles/brozzler-worker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,23 @@
- name: mkdir {{venv_root}}/websockify-ve3
become: true
file: path={{venv_root}}/websockify-ve3 state=directory owner={{user}}


#get python3 version for checks below
- shell: "python --version"
register: python_installed

#websockify's dependency numpy's latest version no longer supports 3.5
- name: install old version of numpy for websockify
pip:
name: numpy==1.18.4
virtualenv: '{{venv_root}}/websockify-ve3'
virtualenv_python: python3
virtualenv_command: python3 /usr/lib/python3/dist-packages/virtualenv.py
extra_args: '--no-input --upgrade --pre --cache-dir=/tmp/pip-cache'
become: true
become_user: '{{user}}'
when: '"Python 3.5" in python_installed.stdout'

- name: install websockify in virtualenv
pip:
name: git+https://github.com/kanaka/websockify.git#egg=websockify
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/rethinkdb/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
- name: ensure rethinkdb apt public key is trusted
apt_key: url=http://download.rethinkdb.com/apt/pubkey.gpg
apt_key: url=https://download.rethinkdb.com/repository/raw/pubkey.gpg
become: true
- name: ensure rethinkdb repo is in apt sources.list
apt_repository:
repo: 'deb http://download.rethinkdb.com/apt {{ansible_lsb.codename|lower}} main'
repo: 'deb https://download.rethinkdb.com/repository/ubuntu-{{ansible_lsb.codename|lower}} {{ansible_lsb.codename|lower}} main'
state: present
become: true
- apt: update_cache=yes
Expand Down

0 comments on commit 25313a9

Please sign in to comment.