<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/21397">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ansible: Fix OBS directory naming<br><br>It's really annoying that OBS uses Debian_8.0 and Debian_9.0 (for 8.x<br>and 9.x) and then Debian_10 for 10.x.  Let's work around this by some<br>conditional vars_file trickery, hopefully once and for all.<br><br>Change-Id: I45c4752774f44332b3f9aaf875f49043c03ec5ca<br>---<br>M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml<br>M ansible/roles/podman/tasks/debian.yml<br>M ansible/setup-jenkins-slave.yml<br>A ansible/vars/Debian-10.yml<br>A ansible/vars/Debian-8.yml<br>A ansible/vars/Debian-9.yml<br>6 files changed, 12 insertions(+), 4 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/97/21397/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml</span><br><span>index 75969e2..fbfc1ec 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml</span><br><span>@@ -16,11 +16,11 @@</span><br><span> </span><br><span> - name: add apt.key</span><br><span>   apt_key:</span><br><span style="color: hsl(0, 100%, 40%);">-    url: https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version}}/Release.key</span><br><span style="color: hsl(120, 100%, 40%);">+    url: https://download.opensuse.org/repositories/network:/osmocom:/latest/{{ obs_distro }}/Release.key</span><br><span> </span><br><span> - name: add apt repository</span><br><span>   apt_repository:</span><br><span style="color: hsl(0, 100%, 40%);">-    repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version }}/ ./"</span><br><span style="color: hsl(120, 100%, 40%);">+    repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/{{ obs_distro }}/ ./"</span><br><span>     filename: obs_osmocom</span><br><span>     update_cache: yes</span><br><span> </span><br><span>diff --git a/ansible/roles/podman/tasks/debian.yml b/ansible/roles/podman/tasks/debian.yml</span><br><span>index 907d75c..e261a3f 100644</span><br><span>--- a/ansible/roles/podman/tasks/debian.yml</span><br><span>+++ b/ansible/roles/podman/tasks/debian.yml</span><br><span>@@ -14,11 +14,11 @@</span><br><span> - name: add docker gpg key to apt keyring</span><br><span>   apt_key:</span><br><span>     id: 2472D6D0D2F66AF87ABA8DA34D64390375060AA4</span><br><span style="color: hsl(0, 100%, 40%);">-    url: https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/Release.key</span><br><span style="color: hsl(120, 100%, 40%);">+    url: https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/{{ obs_distro }}/Release.key</span><br><span>   when: ansible_distribution_major_version < 11</span><br><span> </span><br><span> - apt_repository:</span><br><span style="color: hsl(0, 100%, 40%);">-    repo: "deb https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/ /"</span><br><span style="color: hsl(120, 100%, 40%);">+    repo: "deb https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/{{ obs_distro }}/ /"</span><br><span>     state: present</span><br><span>     update_cache: yes</span><br><span>   when: ansible_distribution_major_version < 11</span><br><span>diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml</span><br><span>index 64938c8..350a40f 100644</span><br><span>--- a/ansible/setup-jenkins-slave.yml</span><br><span>+++ b/ansible/setup-jenkins-slave.yml</span><br><span>@@ -2,6 +2,8 @@</span><br><span> - name: setup jenkins slaves</span><br><span>   hosts: jenkins-slaves</span><br><span>   user: root</span><br><span style="color: hsl(120, 100%, 40%);">+  vars_files:</span><br><span style="color: hsl(120, 100%, 40%);">+    - "vars/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version']}}.yml"</span><br><span>   tasks:</span><br><span>     - name: install common utilities</span><br><span>       apt:</span><br><span>diff --git a/ansible/vars/Debian-10.yml b/ansible/vars/Debian-10.yml</span><br><span>new file mode 100644</span><br><span>index 0000000..e9ec07f</span><br><span>--- /dev/null</span><br><span>+++ b/ansible/vars/Debian-10.yml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+obs_distro: Debian_10</span><br><span>diff --git a/ansible/vars/Debian-8.yml b/ansible/vars/Debian-8.yml</span><br><span>new file mode 100644</span><br><span>index 0000000..12840d4</span><br><span>--- /dev/null</span><br><span>+++ b/ansible/vars/Debian-8.yml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+obs_distro: Debian_9.0</span><br><span>diff --git a/ansible/vars/Debian-9.yml b/ansible/vars/Debian-9.yml</span><br><span>new file mode 100644</span><br><span>index 0000000..12840d4</span><br><span>--- /dev/null</span><br><span>+++ b/ansible/vars/Debian-9.yml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+obs_distro: Debian_9.0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/21397">change 21397</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/c/osmo-ci/+/21397"/><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-Change-Id: I45c4752774f44332b3f9aaf875f49043c03ec5ca </div>
<div style="display:none"> Gerrit-Change-Number: 21397 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>