projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18849-use-rvm-on-debian-10'
[arvados-formula.git]
/
test
/
integration
/
shell
/
controls
/
packages_spec.rb
diff --git
a/test/integration/shell/controls/packages_spec.rb
b/test/integration/shell/controls/packages_spec.rb
index ac58157309f9c6f9c0bbd27085611873e8811bd4..9d52c1239acaca68b59a27d29464135093f611d7 100644
(file)
--- a/
test/integration/shell/controls/packages_spec.rb
+++ b/
test/integration/shell/controls/packages_spec.rb
@@
-41,9
+41,10
@@
end
control 'arvados shell gems' do
title 'should be installed'
control 'arvados shell gems' do
title 'should be installed'
- only_if('Skipped in Centos-7
and Ubuntu-18.04
') do
+ only_if('Skipped in Centos-7
, Ubuntu-18.04 and Debian-10
') do
!((os.redhat? and platform[:release].to_f.truncate == 7) or
!((os.redhat? and platform[:release].to_f.truncate == 7) or
- (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18))
+ (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+ (os.name == 'debian' and platform[:release].to_f.truncate == 10))
end
describe gem('arvados-cli') do
end
describe gem('arvados-cli') do
@@
-54,9
+55,10
@@
end
control 'RVM arvados shell gems' do
title 'should be installed'
control 'RVM arvados shell gems' do
title 'should be installed'
- only_if('Forced requirement for Centos-7
and Ubuntu-18.04
') do
+ only_if('Forced requirement for Centos-7
, Ubuntu-18.04 and Debian-10
') do
(os.redhat? and platform[:release].to_f.truncate == 7) or
(os.redhat? and platform[:release].to_f.truncate == 7) or
- (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+ (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+ (os.name == 'debian' and platform[:release].to_f.truncate == 10)
end
describe gem('arvados-cli', '/usr/local/rvm/bin/rvm all do gem') do
end
describe gem('arvados-cli', '/usr/local/rvm/bin/rvm all do gem') do