diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-11-28 22:30:48 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-11-28 22:33:02 +0100 |
| commit | bf07865cb30c0188d25245a043da091a897235de (patch) | |
| tree | 773b2ae9ee54733820c73c0bd6955df07910274e /ansible | |
| parent | 8df41af01099bd58d09f487e13d54624b05e82e4 (diff) | |
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
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/podman/tasks/debian.yml | 4 | ||||
| -rw-r--r-- | ansible/setup-jenkins-slave.yml | 2 | ||||
| -rw-r--r-- | ansible/vars/Debian-10.yml | 2 | ||||
| -rw-r--r-- | ansible/vars/Debian-8.yml | 2 | ||||
| -rw-r--r-- | ansible/vars/Debian-9.yml | 2 |
6 files changed, 12 insertions, 4 deletions
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 |