From 4aa8b1af9c63b3f249a47562ee2fe1123f91a686 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 4 Aug 2021 14:12:43 -0300 Subject: [PATCH] Update repo tests in Debian's family MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- test/integration/repo/controls/repo_spec.rb | 10 +++++----- test/integration/shell/controls/repo_spec.rb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integration/repo/controls/repo_spec.rb b/test/integration/repo/controls/repo_spec.rb index 8f5edaf..c112538 100644 --- a/test/integration/repo/controls/repo_spec.rb +++ b/test/integration/repo/controls/repo_spec.rb @@ -10,16 +10,16 @@ when 'centos' repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/' when 'debian', 'ubuntu' # Inspec does not provide a `codename` matcher, so we add ours - case os[:release] + case platform[:release].to_f.truncate # ubuntu - when '18.04' + when 18 codename = 'bionic' - when '20.04' + when 20 codename = 'focal' # debian - when '10' + when 10 codename = 'buster' - when '11' + when 11 codename = 'bullseye' end repo_file = '/etc/apt/sources.list.d/arvados.list' diff --git a/test/integration/shell/controls/repo_spec.rb b/test/integration/shell/controls/repo_spec.rb index f6f8e2c..0fdbdff 100644 --- a/test/integration/shell/controls/repo_spec.rb +++ b/test/integration/shell/controls/repo_spec.rb @@ -6,16 +6,16 @@ when 'centos' repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/dev/$basearch/' when 'debian', 'ubuntu' # Inspec does not provide a `codename` matcher, so we add ours - case os[:release] + case platform[:release].to_f.truncate # ubuntu - when '18.04' + when 18 codename = 'bionic' - when '20.04' + when 20 codename = 'focal' # debian - when '10' + when 10 codename = 'buster' - when '11' + when 11 codename = 'bullseye' end repo_file = '/etc/apt/sources.list.d/arvados.list' -- 2.30.2