From eb52f0c8982136dc1a9eccd8fa118b284f7b7e6f Mon Sep 17 00:00:00 2001 From: Simon Archieri Date: Wed, 2 Jan 2019 16:47:48 +0100 Subject: [PATCH 1/4] Add a filter to skip commented line in /etc/hosts --- deployLXCdevContainers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployLXCdevContainers.sh b/deployLXCdevContainers.sh index e4a08d8..e762c44 100755 --- a/deployLXCdevContainers.sh +++ b/deployLXCdevContainers.sh @@ -71,7 +71,7 @@ echo Done echo ------------------------------------ echo "Add opv_master line in /etc/host" -lineOpvMaster=`cat /etc/hosts | grep opv_master -n | awk '{print $1}' FS=":"` +lineOpvMaster=`cat /etc/hosts | sed "s/#.*//g" | grep opv_master -n | awk '{print $1}' FS=":"` for i in $lineOpvMaster do From 94acc7b5079a888665c3b76fba254e77ae829557 Mon Sep 17 00:00:00 2001 From: Simon Archieri Date: Sat, 19 Jan 2019 20:49:33 +0100 Subject: [PATCH 2/4] Change opensfm repo --- roles/base/tasks/opensfm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/base/tasks/opensfm.yml b/roles/base/tasks/opensfm.yml index db7f594..7dd8784 100644 --- a/roles/base/tasks/opensfm.yml +++ b/roles/base/tasks/opensfm.yml @@ -41,7 +41,7 @@ pip3 install opencv-python cd /home/opv/ - git clone https://github.com/OpenPathView/OpenSfM.git + git clone https://github.com/mapillary/OpenSfM.git cd OpenSfM pip3 install -r requirements.txt python3 setup.py build From 128e94d18c13d8baf4e36540ce2046f7b3b11ffd Mon Sep 17 00:00:00 2001 From: Christophe NOUCHET Date: Sat, 26 Jan 2019 02:09:32 +0100 Subject: [PATCH 3/4] fix(pip): Fix version of pip to 18.1 to preserve the dependency link --- roles/base/tasks/opv.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/roles/base/tasks/opv.yml b/roles/base/tasks/opv.yml index 4637b5f..965427a 100644 --- a/roles/base/tasks/opv.yml +++ b/roles/base/tasks/opv.yml @@ -25,7 +25,7 @@ ###Ā Installation de OPVĀ ### ########################### -- name: Update pip, wheel and setuptools +- name: Update wheel and setuptools pip: name: "{{ item }}" extra_args: "--upgrade" @@ -34,12 +34,25 @@ state: latest editable: false with_items: - - pip - wheel - setuptools become: yes become_user: opv +- name: Update pip + pip: + name: "{{ item }}" + extra_args: "--upgrade" + virtualenv: /home/opv/venvs/opv + virtualenv_command: pyvenv + state: present + editable: false + version: 18.1 + with_items: + - pip + become: yes + become_user: opv + - name: Install OPV modules pip: name: "git+{{ item }}" From b05115fe946ed5b4eed80ce7955a7a4aada9e775 Mon Sep 17 00:00:00 2001 From: Christophe NOUCHET Date: Sat, 26 Jan 2019 18:12:12 +0100 Subject: [PATCH 4/4] fix(OpenSfM): Failed if opensfm not installed --- roles/base/tasks/opensfm.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/base/tasks/opensfm.yml b/roles/base/tasks/opensfm.yml index 7dd8784..4814ae1 100644 --- a/roles/base/tasks/opensfm.yml +++ b/roles/base/tasks/opensfm.yml @@ -39,13 +39,12 @@ shell: | source /home/opv/venvs/opv/bin/activate pip3 install opencv-python - cd /home/opv/ - git clone https://github.com/mapillary/OpenSfM.git + git clone --recursive https://github.com/mapillary/OpenSfM.git cd OpenSfM - pip3 install -r requirements.txt - python3 setup.py build + pip3 install -r requirements.txt && \ + python3 setup.py build && \ python3 setup.py install - exit 0 + exit $? args: executable: /bin/bash