Skip to content

Commit 62a6381

Browse files
committed
Remove platform version complexity for Java version
OpenVox only supports platform 7 and 8, and we don't really need to worry about ancient el8 being weird. We build OpenVox with Java 11, so make this the base version, and ideally use 17 when available.
1 parent 07cb326 commit 62a6381

File tree

1 file changed

+5
-28
lines changed
  • resources/puppetlabs/lein-ezbake/template/global/ext

1 file changed

+5
-28
lines changed

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -189,24 +189,13 @@
189189
options.systemd_el = 1
190190
elsif options.operating_system == :el && options.os_version >= 7 # systemd el
191191
if ! options.is_pe
192-
fpm_opts << "--depends tzdata-java"
193192
options.java =
194-
case options.platform_version
195-
when 8
196-
# rpm on Redhat 7 may not support OR dependencies
197-
if options.os_version == 7
198-
'java-11-openjdk-headless'
199-
elsif options.os_version == 8
200-
'(java-17-openjdk-headless or java-11-openjdk-headless)'
201-
elsif options.os_version >= 9
202-
'java-17-openjdk-headless'
203-
else
204-
fail "Unrecognized el os version #{options.os_version}"
205-
end
206-
when 7
193+
if options.os_version == 7
207194
'java-11-openjdk-headless'
195+
elsif options.os_version >= 8
196+
'java-17-openjdk-headless'
208197
else
209-
fail "Unknown Puppet Platform Version #{options.platform_version}"
198+
fail "Unrecognized el os version #{options.os_version}"
210199
end
211200
end
212201

@@ -223,19 +212,7 @@
223212
options.systemd_sles = 1
224213
options.sles = 1
225214
if ! options.is_pe
226-
options.java =
227-
case options.platform_version
228-
when 8
229-
'java-11-openjdk-headless'
230-
when 7
231-
if options.os_version > 12
232-
'java-11-openjdk-headless'
233-
else
234-
'java-1_8_0-openjdk-headless'
235-
end
236-
else
237-
fail "Unknown Puppet Platform Version #{options.platform_version}"
238-
end
215+
options.java = 'java-11-openjdk-headless'
239216
end
240217
elsif options.operating_system == :sles #old sles
241218
options.sysvinit = 1

0 commit comments

Comments
 (0)