From 7204b8ecc129c7ca7391be312e40471c8f6ccdcf Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 6 Jan 2025 11:32:03 +0100 Subject: [PATCH 1/4] Install Java 17 JDK in acceptance tests on Red Hat OSes Jenkins 2.479.1 requires Java 17 or newer and breaks with Java 11 --- spec/acceptance/hieradata/family/RedHat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/hieradata/family/RedHat.yaml b/spec/acceptance/hieradata/family/RedHat.yaml index e2b80fb89..ef15698ee 100644 --- a/spec/acceptance/hieradata/family/RedHat.yaml +++ b/spec/acceptance/hieradata/family/RedHat.yaml @@ -1,3 +1,3 @@ --- -# Jenkins 2.361.1 requires Java 11 or newer -java::package: java-11-openjdk-devel +# Jenkins 2.479.1 requires Java 17 or newer +java::package: java-17-openjdk-devel From 3890138fe961c5f618c4d91b990ae58165b37250 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 6 Jan 2025 12:04:03 +0100 Subject: [PATCH 2/4] Install Java 17 JDK in acceptance tests on Debian OSes Jenkins 2.479.1 requires Java 17 or newer and breaks with Java 11 --- spec/acceptance/hieradata/family/Debian.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 spec/acceptance/hieradata/family/Debian.yaml diff --git a/spec/acceptance/hieradata/family/Debian.yaml b/spec/acceptance/hieradata/family/Debian.yaml new file mode 100644 index 000000000..297b9410b --- /dev/null +++ b/spec/acceptance/hieradata/family/Debian.yaml @@ -0,0 +1,3 @@ +--- +# Jenkins 2.479.1 requires Java 17 or newer +java::package: openjdk-17-jdk From 90cbcf10e561930855c2f9353e2b11ad4e740c95 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 6 Jan 2025 14:47:34 +0100 Subject: [PATCH 3/4] update list of plugins needed for tests --- .../xtypes/jenkins_credentials_spec.rb | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/spec/acceptance/xtypes/jenkins_credentials_spec.rb b/spec/acceptance/xtypes/jenkins_credentials_spec.rb index d778aa3a8..6c5f9d78d 100644 --- a/spec/acceptance/xtypes/jenkins_credentials_spec.rb +++ b/spec/acceptance/xtypes/jenkins_credentials_spec.rb @@ -47,6 +47,7 @@ class {'jenkins': 'apache-httpcomponents-client-4-api', 'caffeine-api', 'command-launcher', + 'eddsa-api', 'gson-api', 'jaxb', 'jdk-tool', @@ -89,6 +90,7 @@ class {'jenkins': include jenkins::cli::config jenkins::plugin { [ + 'eddsa-api', 'gson-api', 'ssh-credentials', 'variant', @@ -194,22 +196,13 @@ class {'jenkins': jenkins::plugin { [ 'apache-httpcomponents-client-4-api', 'aws-credentials', - 'aws-java-sdk', - 'aws-java-sdk-cloudformation', - 'aws-java-sdk-codebuild', 'aws-java-sdk-ec2', - 'aws-java-sdk-ecr', - 'aws-java-sdk-ecs', - 'aws-java-sdk-efs', - 'aws-java-sdk-elasticbeanstalk', - 'aws-java-sdk-iam', - 'aws-java-sdk-logs', 'aws-java-sdk-minimal', - 'aws-java-sdk-sns', - 'aws-java-sdk-sqs', - 'aws-java-sdk-ssm', + 'aws-java-sdk2-core', + 'aws-java-sdk2-ec2', 'caffeine-api', 'credentials-binding', + 'eddsa-api', 'gson-api', 'jackson2-api', 'jaxb', @@ -264,6 +257,7 @@ class {'jenkins': 'credentials-binding', 'display-url-api', 'echarts-api', + 'eddsa-api', 'font-awesome-api', 'git', 'git-client', @@ -295,13 +289,11 @@ class {'jenkins': 'trilead-api', 'variant', 'workflow-api', + 'workflow-job', 'workflow-scm-step', 'workflow-step-api', 'workflow-support', ]: } - jenkins::plugin { 'workflow-job': - version => '1400.v7fd111b_ec82f' - } jenkins_credentials { '7e86e9fb-a8af-480f-b596-7191dc02bf38': ensure => 'present', @@ -343,6 +335,7 @@ class {'jenkins': 'display-url-api', 'durable-task', 'echarts-api', + 'eddsa-api', 'font-awesome-api', 'gson-api', 'ionicons-api', @@ -368,13 +361,11 @@ class {'jenkins': 'workflow-basic-steps', 'workflow-cps', 'workflow-durable-task-step', + 'workflow-job', 'workflow-scm-step', 'workflow-step-api', 'workflow-support', ]: } - jenkins::plugin { 'workflow-job': - version => '1400.v7fd111b_ec82f' - } jenkins_credentials { '562fa23d-a441-4cab-997f-58df6e245813': ensure => 'present', From d2d6c0ee8a12d9f2e8579093d4ab093546715547 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 6 Jan 2025 20:00:13 +0100 Subject: [PATCH 4/4] disable StartLimit* during tests, otherwise systemd hates us --- spec/acceptance/hieradata/common.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 spec/acceptance/hieradata/common.yaml diff --git a/spec/acceptance/hieradata/common.yaml b/spec/acceptance/hieradata/common.yaml new file mode 100644 index 000000000..087e17b42 --- /dev/null +++ b/spec/acceptance/hieradata/common.yaml @@ -0,0 +1,4 @@ +--- +jenkins::service_override: + StartLimitIntervalSec: '0' + StartLimitBurst: '0'