Merge pull request #1115 from voxpupuli/java17

Install Java 17 JDK in acceptance tests
voxpupuli · Jan 6, 2025 · 33c557d · 33c557d
2 parents 5fcacf5 + d2d6c0e
commit 33c557d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/spec/acceptance/hieradata/common.yaml b/spec/acceptance/hieradata/common.yaml
@@ -0,0 +1,4 @@
+---
+jenkins::service_override:
+  StartLimitIntervalSec: '0'
+  StartLimitBurst: '0'
diff --git a/spec/acceptance/hieradata/family/Debian.yaml 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
diff --git 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
diff --git 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',