Update repo tests in Debian's family

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/test/integration/repo/controls/repo_spec.rb b/test/integration/repo/controls/repo_spec.rb
index 8f5edafacd2c5d8e802d3ac73709a7ccc4560ddd..c11253810f01d5a153d471eceacaaeeba63cfcb7 100644 (file)
--- 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 f6f8e2c985156e95d731d6faf1722e130f8bebfa..0fdbdff78608ac784b282e1979653a98f4b7423e 100644 (file)
--- 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'