<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13793">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">generalize the install-poky-sdk role to support multiple sdks<br><br>Change-Id: I35f34a089311808cb21a064dd50e41cd1887b320<br>---<br>M ansible/roles/install-poky-sdk/README.md<br>M ansible/roles/install-poky-sdk/defaults/main.yml<br>M ansible/roles/install-poky-sdk/tasks/main.yml<br>M ansible/setup-desktop.yml<br>M ansible/setup-jenkins-slave.yml<br>5 files changed, 32 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/13793/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ansible/roles/install-poky-sdk/README.md b/ansible/roles/install-poky-sdk/README.md</span><br><span>index 541ea3c..7f2c31e 100644</span><br><span>--- a/ansible/roles/install-poky-sdk/README.md</span><br><span>+++ b/ansible/roles/install-poky-sdk/README.md</span><br><span>@@ -1,10 +1,17 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# Install the poky sdk used to build sysmobts binaries</span><br><span style="color: hsl(120, 100%, 40%);">+# Install the poky sdk's used to build sysmobts binaries</span><br><span> </span><br><span> # Poky Installation</span><br><span> </span><br><span> The poky installation requires you to have the installer available.</span><br><span> Put the `poky_installer_file` to the root directory of this repo.</span><br><span style="color: hsl(0, 100%, 40%);">-Also the exact filename must match the variable `poky_installer_file` and the</span><br><span style="color: hsl(0, 100%, 40%);">-`poky_version`.</span><br><span style="color: hsl(0, 100%, 40%);">-For the defaults of those variable have a look into `defaults/main.yml`.</span><br><span style="color: hsl(120, 100%, 40%);">+Also the exact filename must match the variable `poky_installer_file`</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+example:</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+    - name: install-poky-sdk</span><br><span style="color: hsl(120, 100%, 40%);">+      jenkins_user: osmocom-build</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_install_file: poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_dest: /opt/poky-sdk/2.3.4/</span><br><span style="color: hsl(120, 100%, 40%);">+      tags:</span><br><span style="color: hsl(120, 100%, 40%);">+        - poky</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span>diff --git a/ansible/roles/install-poky-sdk/defaults/main.yml b/ansible/roles/install-poky-sdk/defaults/main.yml</span><br><span>index 9b8eb04..5b7385c 100644</span><br><span>--- a/ansible/roles/install-poky-sdk/defaults/main.yml</span><br><span>+++ b/ansible/roles/install-poky-sdk/defaults/main.yml</span><br><span>@@ -1,7 +1,3 @@</span><br><span> ---</span><br><span> # OS user</span><br><span> jenkins_user: jenkins</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh</span><br><span style="color: hsl(0, 100%, 40%);">-poky_version: 2.3.4</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml b/ansible/roles/install-poky-sdk/tasks/main.yml</span><br><span>index 9d64347..85b310a 100644</span><br><span>--- a/ansible/roles/install-poky-sdk/tasks/main.yml</span><br><span>+++ b/ansible/roles/install-poky-sdk/tasks/main.yml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> ---</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> - name: install bzip2 and tar</span><br><span>   apt:</span><br><span>     name: "{{ item }}"</span><br><span>@@ -19,21 +18,28 @@</span><br><span>   tags: [poky]</span><br><span> </span><br><span> - name: execute poky installer</span><br><span style="color: hsl(0, 100%, 40%);">-  command: "/tmp/{{ poky_installer_file }} -y"</span><br><span style="color: hsl(120, 100%, 40%);">+  command: "/tmp/{{ poky_installer_file }} -y -d '{{ poky_dest }}'"</span><br><span>   args:</span><br><span style="color: hsl(0, 100%, 40%);">-    creates: "/opt/poky/{{ poky_version }}"</span><br><span style="color: hsl(120, 100%, 40%);">+    creates: "{{ poky_dest }}"</span><br><span>   when: poky_copy.failed == false</span><br><span>   tags: [poky]</span><br><span> </span><br><span> - name: change owner/group to jenkins user</span><br><span>   file:</span><br><span style="color: hsl(0, 100%, 40%);">-    path: /opt/poky</span><br><span style="color: hsl(120, 100%, 40%);">+    path: "{{ poky_dest }}"</span><br><span>     owner: "{{ jenkins_user }}"</span><br><span>     group: "{{ jenkins_user }}"</span><br><span>     recurse: yes</span><br><span>   when: poky_copy.failed == false</span><br><span>   tags: [poky]</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+- name: remove poky installer</span><br><span style="color: hsl(120, 100%, 40%);">+  file:</span><br><span style="color: hsl(120, 100%, 40%);">+    path: "/tmp/{{ poky_installer_file }}"</span><br><span style="color: hsl(120, 100%, 40%);">+    state: absent</span><br><span style="color: hsl(120, 100%, 40%);">+  when: poky_copy.failed == false</span><br><span style="color: hsl(120, 100%, 40%);">+  tags: [poky]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> - name: "Please download {{ poky_installer_file }} to your ansible directory to allow ansible to install poky"</span><br><span>   debug:</span><br><span>     msg: "Ansible can not find or copy {{ poky_installer_file }}"</span><br><span>diff --git a/ansible/setup-desktop.yml b/ansible/setup-desktop.yml</span><br><span>index 507a8f2..563d124 100644</span><br><span>--- a/ansible/setup-desktop.yml</span><br><span>+++ b/ansible/setup-desktop.yml</span><br><span>@@ -9,6 +9,8 @@</span><br><span> </span><br><span>     - name: install-poky-sdk</span><br><span>       jenkins_user: osmocom-build</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_dest: /opt/poky-sdk/2.3.4/</span><br><span>       tags:</span><br><span>         - poky</span><br><span> </span><br><span>diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml</span><br><span>index 4ca7188..1135ab2 100644</span><br><span>--- a/ansible/setup-jenkins-slave.yml</span><br><span>+++ b/ansible/setup-jenkins-slave.yml</span><br><span>@@ -21,6 +21,15 @@</span><br><span> </span><br><span>     - name: install-poky-sdk</span><br><span>       jenkins_user: osmocom-build</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_install_file: poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4-20190426050512.sh</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_dest: /opt/poky-oc2g/2.3.4/</span><br><span style="color: hsl(120, 100%, 40%);">+      tags:</span><br><span style="color: hsl(120, 100%, 40%);">+        - poky</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    - name: install-poky-sdk</span><br><span style="color: hsl(120, 100%, 40%);">+      jenkins_user: osmocom-build</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh</span><br><span style="color: hsl(120, 100%, 40%);">+      poky_dest: /opt/poky-sdk/2.3.4/</span><br><span>       tags:</span><br><span>         - poky</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13793">change 13793</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13793"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I35f34a089311808cb21a064dd50e41cd1887b320 </div>
<div style="display:none"> Gerrit-Change-Number: 13793 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>