Skip to content

Commit 64c4e7e

Browse files
committed
fix: Adjusted build host policy to install jdk once
Ticket: ENT-13804 Changelog: none
1 parent 9238d53 commit 64c4e7e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ci/cfengine-build-host-setup.cf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ bundle agent cfengine_build_host_setup
209209
linux::
210210
"have_tmp_mount" expression => returnszero("mount | grep '/tmp'", "useshell");
211211
"have_coredumpctl" expression => returnszero("command -v coredumpctl", "useshell");
212-
"missing_opt_jdk21" expression => not(fileexists("/opt/jdk-21.0.8"));
212+
"missing_java" expression => not(fileexists("/usr/bin/java"));
213213
(redhat|centos).!(redhat_6|centos_6|redhat_7|centos_7)::
214214
"yum_conf_ok" expression => returnszero("grep best=False /etc/yum.conf >/dev/null", "useshell");
215215
redhat_6|centos_6|redhat_7|centos_7::
@@ -246,7 +246,7 @@ bundle agent cfengine_build_host_setup
246246
"sysctl kernel.core_pattern='|/lib/systemd/systemd-coredump %p %u %g %s %t %e'" -> { "ENT-12669" }
247247
comment => "Ensure that core_pattern is proper for systemd-coredump if coredumpctl is present.",
248248
contain => in_shell;
249-
missing_opt_jdk21::
249+
missing_java::
250250
"sh $(this.promise_dirname)/linux-install-jdk21.sh" contain => in_shell;
251251
(redhat_7|centos_7|redhat_8|centos_8|redhat_9|redhat_10).(!have_development_tools).(yum_dnf_conf_ok)::
252252
"yum groups install -y 'Development Tools'" contain => in_shell;

0 commit comments

Comments
 (0)