File tree Expand file tree Collapse file tree 3 files changed +3
-10
lines changed Expand file tree Collapse file tree 3 files changed +3
-10
lines changed Original file line number Diff line number Diff line change @@ -17,8 +17,6 @@ travis_deb:
1717travis_ub_6 :
1818 provisioner : docker
1919 images :
20- - litmusimage/ubuntu:14.04
21- - litmusimage/ubuntu:16.04
2220 - litmusimage/ubuntu:18.04
2321 - litmusimage/ubuntu:20.04
2422travis_el7 :
@@ -42,11 +40,8 @@ release_checks_6:
4240 - oracle-6-x86_64
4341 - scientific-6-x86_64
4442 - scientific-7-x86_64
45- - debian-8-x86_64
4643 - debian-9-x86_64
4744 - debian-10-x86_64
48- - ubuntu-1404-x86_64
49- - ubuntu-1604-x86_64
5045 - ubuntu-1804-x86_64
5146 - ubuntu-2004-x86_64
5247 - sles-11-x86_64
Original file line number Diff line number Diff line change 33require 'spec_helper_acceptance'
44
55confine_array = [
6- ( os [ :family ] =~ %r{debian|ubuntu} && ( os [ :release ] == '16.04' || os [ :release ] == ' 18.04' || os [ :release ] == '8' ) ) ,
6+ ( os [ :family ] =~ %r{debian|ubuntu} && os [ :release ] == '18.04' ) ,
77 ( os [ :family ] . include? ( 'redhat' ) && os [ :release ] . start_with? ( '5' ) ) ,
88]
99stop_test = confine_array . any?
Original file line number Diff line number Diff line change 1515
1616 let :java_home do
1717 if os [ :family ] . match? ( %r{debian|ubuntu} )
18- if os [ :release ] == '20.04' || os [ :release ] == '18.04' || os [ :release ] . start_with? ( '11' ) || os [ :release ] . start_with? ( '10' )
19- '"/usr/lib/jvm/java-11-openjdk-${::architecture}"'
20- elsif os [ :release ] == '16.04' || os [ :release ] . start_with? ( '9' )
18+ if os [ :release ] . start_with? ( '9' )
2119 '"/usr/lib/jvm/java-8-openjdk-${::architecture}"'
2220 else
23- '"/usr/lib/jvm/java-7 -openjdk-${::architecture}"'
21+ '"/usr/lib/jvm/java-11 -openjdk-${::architecture}"'
2422 end
2523 elsif os [ :family ] . include? ( 'redhat' )
2624 '"/etc/alternatives/java_sdk"'
You can’t perform that action at this time.
0 commit comments