From db72d81847bddb517f6426cd53388e43c76fa9f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 22 Jan 2021 14:01:27 -0300 Subject: [PATCH] fix(repo): distro/release are not always the same --- arvados/repo/install.sls | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arvados/repo/install.sls b/arvados/repo/install.sls index 41df68b..cd42aaa 100644 --- a/arvados/repo/install.sls +++ b/arvados/repo/install.sls @@ -7,17 +7,19 @@ {%- if arvados.use_upstream_repo %} {%- if grains.get('os_family') == 'Debian' %} + {%- set distro = grains.get('lsb_distrib_codename') %} + {%- if arvados.release == 'testing' %} - {%- set release = grains.get('lsb_distrib_codename') ~ '-testing' %} + {%- set release = distro ~ '-testing' %} {%- elif arvados.release == 'development' %} - {%- set release = grains.get('lsb_distrib_codename') ~ '-dev' %} + {%- set release = distro ~ '-dev' %} {%- else %} - {%- set release = grains.get('lsb_distrib_codename') %} + {%- set release = distro %} {%- endif %} arvados-repo-install-pkgrepo-managed: pkgrepo.managed: - humanname: {{ arvados.repo.humanname }} - - name: deb {{ arvados.repo.url_base }}/{{ release }} {{ release }} main + - name: deb {{ arvados.repo.url_base }}/{{ distro }} {{ release }} main - file: {{ arvados.repo.file }} - key_url: {{ arvados.repo.key_url }} -- 2.30.2