[MERGED] osmo-ci[master]: ansible: gsm-tester: move usrp tasks to gsm-tester-bts

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: ansible: gsm-tester: move usrp tasks to gsm-tester-bts
......................................................................


ansible: gsm-tester: move usrp tasks to gsm-tester-bts

Change-Id: I9caebed94c3473051b82e2cdc35f6dfb9f862084
---
M ansible/roles/gsm-tester-bts/tasks/main.yml
M ansible/roles/gsm-tester-modems/tasks/main.yml
2 files changed, 22 insertions(+), 22 deletions(-)

Approvals:
  lynxis lazus: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/ansible/roles/gsm-tester-bts/tasks/main.yml b/ansible/roles/gsm-tester-bts/tasks/main.yml
index 4430a01..f51da6d 100644
--- a/ansible/roles/gsm-tester-bts/tasks/main.yml
+++ b/ansible/roles/gsm-tester-bts/tasks/main.yml
@@ -12,3 +12,25 @@
   pip:
     name: pysispm
     executable: pip3
+
+- name: gsm-tester-bts | usrp install apt dependecies
+  apt:
+    name: "{{ item }}"
+    cache_valid_time: 3600
+    update_cache: yes
+  with_items:
+    - libuhd-dev
+    - uhd-host
+  register: uhd_installed
+
+- name: gsm-tester-bts | usrp download firmware
+  command: uhd_images_downloader
+  args:
+    creates: /usr/share/uhd/images
+  when: uhd_installed | changed
+
+- name: gsm-tester-bts | usrp allow jenkins to access
+  user:
+    name: jenkins
+    groups: usrp
+    append: yes
diff --git a/ansible/roles/gsm-tester-modems/tasks/main.yml b/ansible/roles/gsm-tester-modems/tasks/main.yml
index b766c73..81c6446 100644
--- a/ansible/roles/gsm-tester-modems/tasks/main.yml
+++ b/ansible/roles/gsm-tester-modems/tasks/main.yml
@@ -1,27 +1,5 @@
 ---
 # modems
-- name: install dependecies for usrp
-  apt:
-    name: "{{ item }}"
-    cache_valid_time: 3600
-    update_cache: yes
-  with_items:
-    - libuhd-dev
-    - uhd-host
-  register: uhd_installed
-
-- name: download firmware for uhd/usrp
-  command: uhd_images_downloader
-  args:
-    creates: /usr/share/uhd/images
-  when: uhd_installed | changed
-
-- name: allow jenkins to access USRP
-  user:
-    name: jenkins
-    groups: usrp
-    append: yes
-
 - name: install gobi2000 packages 
   apt:
     name: gobi-loader

-- 
To view, visit https://gerrit.osmocom.org/7738
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9caebed94c3473051b82e2cdc35f6dfb9f862084
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>