From fcb2326f0f89d5569638d22a54afaf0fe331bb1d Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 27 Mar 2024 00:31:50 +0100 Subject: [PATCH 1/4] remove deprecated function with native puppet --- manifests/user_setup.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/user_setup.pp b/manifests/user_setup.pp index 886ac3e4d..63fab79d1 100644 --- a/manifests/user_setup.pp +++ b/manifests/user_setup.pp @@ -55,10 +55,7 @@ # On Debian the service is started by default so it must be configured prior # to installation which is why it's configured in this file rather than config.pp - $config_hash = merge( - $jenkins::params::config_hash_defaults, - $jenkins::config_hash - ) + $config_hash = $jenkins::params::config_hash_defaults + $jenkins::config_hash systemd::dropin_file { 'puppet-overrides.conf': unit => 'jenkins.service', From 8b4dcb20f0246137964838265a8dd047e68991bb Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 27 Mar 2024 07:51:07 +0100 Subject: [PATCH 2/4] test if hiera needs different layout --- spec/acceptance/hieradata/{os/RedHat.yaml => common.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/acceptance/hieradata/{os/RedHat.yaml => common.yaml} (100%) diff --git a/spec/acceptance/hieradata/os/RedHat.yaml b/spec/acceptance/hieradata/common.yaml similarity index 100% rename from spec/acceptance/hieradata/os/RedHat.yaml rename to spec/acceptance/hieradata/common.yaml From fe6ac523760057ec630adce63e8851458bf30300 Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 27 Mar 2024 23:45:38 +0100 Subject: [PATCH 3/4] add correct Debian/Ubuntu java package name --- spec/acceptance/hieradata/os/Debian.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 spec/acceptance/hieradata/os/Debian.yaml diff --git a/spec/acceptance/hieradata/os/Debian.yaml b/spec/acceptance/hieradata/os/Debian.yaml new file mode 100644 index 000000000..22b3f934c --- /dev/null +++ b/spec/acceptance/hieradata/os/Debian.yaml @@ -0,0 +1,3 @@ +--- +# Jenkins 2.361.1 requires Java 11 or newer +java::package: openjdk-11-jdk From d60362146157365541d685c73f6b26d45c1fa092 Mon Sep 17 00:00:00 2001 From: markuszilch Date: Thu, 28 Mar 2024 15:22:12 +0100 Subject: [PATCH 4/4] push javaversion for acceptance tests to 17 --- spec/acceptance/hieradata/common.yaml | 2 +- spec/acceptance/hieradata/os/Debian.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/hieradata/common.yaml b/spec/acceptance/hieradata/common.yaml index e2b80fb89..78498f89b 100644 --- a/spec/acceptance/hieradata/common.yaml +++ b/spec/acceptance/hieradata/common.yaml @@ -1,3 +1,3 @@ --- # Jenkins 2.361.1 requires Java 11 or newer -java::package: java-11-openjdk-devel +java::package: java-17-openjdk-devel diff --git a/spec/acceptance/hieradata/os/Debian.yaml b/spec/acceptance/hieradata/os/Debian.yaml index 22b3f934c..9fecec25f 100644 --- a/spec/acceptance/hieradata/os/Debian.yaml +++ b/spec/acceptance/hieradata/os/Debian.yaml @@ -1,3 +1,3 @@ --- # Jenkins 2.361.1 requires Java 11 or newer -java::package: openjdk-11-jdk +java::package: openjdk-17-jdk