Merge pull request #994 from mira-miracoli/jenkins-update

Jenkins update
usegalaxy-eu · Nov 15, 2023 · 3717753 · 3717753
2 parents bc0a7e1 + 156c7bd
commit 3717753
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/group_vars/build.yml b/group_vars/build.yml
@@ -3,12 +3,12 @@
 jenkins_home: /opt/jenkins/jenkins
 jenkins_prefer_lts: true
 java_packages:
-  - java-11-openjdk
+  - java-17-openjdk
 jenkins_admin_token: "{{ jenkins_admin_token_secret }}"
 
 # runSetupWizard=false is default
 # Add the CSP so we can embed galaxy on WF testing pages / display HTML
-jenkins_java_options: "-Dhudson.model.ParametersAction.keepUndefinedParameters=true -Djenkins.install.runSetupWizard=false -Dhudson.model.DirectoryBrowserSupport.CSP=\\\"default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'unsafe-inline'; frame-src *;\\\""
+jenkins_java_options: "--enable-future-java -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Djenkins.install.runSetupWizard=false -Dhudson.model.DirectoryBrowserSupport.CSP=\\\"default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'unsafe-inline'; frame-src *;\\\""
 
 # Certbot
 certbot_auth_method: --webroot

diff --git a/requirements.yaml b/requirements.yaml
@@ -59,7 +59,7 @@ roles:
   - name: geerlingguy.docker
     version: 4.1.1
   - name: geerlingguy.java
-    version: 1.9.5
+    version: 2.3.2
   - name: geerlingguy.jenkins
     version: 4.3.0
   - name: geerlingguy.repo-epel