Change in osmo-ci[master]: ansible: Fix OBS directory naming

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21397 )

Change subject: ansible: Fix OBS directory naming
......................................................................

ansible: Fix OBS directory naming

It's really annoying that OBS uses Debian_8.0 and Debian_9.0 (for 8.x
and 9.x) and then Debian_10 for 10.x.  Let's work around this by some
conditional vars_file trickery, hopefully once and for all.

Change-Id: I45c4752774f44332b3f9aaf875f49043c03ec5ca
---
M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
M ansible/roles/podman/tasks/debian.yml
M ansible/setup-jenkins-slave.yml
A ansible/vars/Debian-10.yml
A ansible/vars/Debian-8.yml
A ansible/vars/Debian-9.yml
6 files changed, 12 insertions(+), 4 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved; Verified



diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
index 75969e2..fbfc1ec 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
@@ -16,11 +16,11 @@
 
 - name: add apt.key
   apt_key:
-    url: https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version}}/Release.key
+    url: https://download.opensuse.org/repositories/network:/osmocom:/latest/{{ obs_distro }}/Release.key
 
 - name: add apt repository
   apt_repository:
-    repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version }}/ ./"
+    repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/{{ obs_distro }}/ ./"
     filename: obs_osmocom
     update_cache: yes
 
diff --git a/ansible/roles/podman/tasks/debian.yml b/ansible/roles/podman/tasks/debian.yml
index 907d75c..e261a3f 100644
--- a/ansible/roles/podman/tasks/debian.yml
+++ b/ansible/roles/podman/tasks/debian.yml
@@ -14,11 +14,11 @@
 - name: add docker gpg key to apt keyring
   apt_key:
     id: 2472D6D0D2F66AF87ABA8DA34D64390375060AA4
-    url: https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/Release.key
+    url: https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/{{ obs_distro }}/Release.key
   when: ansible_distribution_major_version < 11
 
 - apt_repository:
-    repo: "deb https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/ /"
+    repo: "deb https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/{{ obs_distro }}/ /"
     state: present
     update_cache: yes
   when: ansible_distribution_major_version < 11
diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml
index 64938c8..350a40f 100644
--- a/ansible/setup-jenkins-slave.yml
+++ b/ansible/setup-jenkins-slave.yml
@@ -2,6 +2,8 @@
 - name: setup jenkins slaves
   hosts: jenkins-slaves
   user: root
+  vars_files:
+    - "vars/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version']}}.yml"
   tasks:
     - name: install common utilities
       apt:
diff --git a/ansible/vars/Debian-10.yml b/ansible/vars/Debian-10.yml
new file mode 100644
index 0000000..e9ec07f
--- /dev/null
+++ b/ansible/vars/Debian-10.yml
@@ -0,0 +1,2 @@
+---
+obs_distro: Debian_10
diff --git a/ansible/vars/Debian-8.yml b/ansible/vars/Debian-8.yml
new file mode 100644
index 0000000..12840d4
--- /dev/null
+++ b/ansible/vars/Debian-8.yml
@@ -0,0 +1,2 @@
+---
+obs_distro: Debian_9.0
diff --git a/ansible/vars/Debian-9.yml b/ansible/vars/Debian-9.yml
new file mode 100644
index 0000000..12840d4
--- /dev/null
+++ b/ansible/vars/Debian-9.yml
@@ -0,0 +1,2 @@
+---
+obs_distro: Debian_9.0

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21397
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I45c4752774f44332b3f9aaf875f49043c03ec5ca
Gerrit-Change-Number: 21397
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201130/b95253cd/attachment.htm>