From 8d58b3befeda4f3b6b678d5d11e434dfe09e7f56 Mon Sep 17 00:00:00 2001
From: Leonardo Brambilla <140282369+leob-morean@users.noreply.github.com>
Date: Thu, 7 Sep 2023 09:57:43 -0300
Subject: [PATCH] CLM-27258: Updated the latest version of JenkinsCI 2.414.1 to
 be tested with Java 17 (#282)

Updated the latest version of JenkinsCI, 2.414.1, to be tested with only Java 17.
Keep intermediate version (2.401.1) to be tested with Java 11

Also updates integration test `PipelineSyntaxIntegrationTest` that started failing with this latest JenkinsCI version.

Ref: CLM-27258
---
 Jenkinsfile.sonatype.extra-tests                              | 4 ++--
 .../sonatype/nexus/ci/iq/PipelineSyntaxIntegrationTest.groovy | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.sonatype.extra-tests b/Jenkinsfile.sonatype.extra-tests
index cb8644bf..a1dc1157 100644
--- a/Jenkinsfile.sonatype.extra-tests
+++ b/Jenkinsfile.sonatype.extra-tests
@@ -56,11 +56,11 @@ pipeline {
             }
           }
         }
-        stage('Jenkins 2.401.1 - Java 17') {
+        stage('Jenkins 2.414.1 - Java 17') {
           agent { label agentLabel }
           steps {
             runTests('OpenJDK 17',
-                '-Djenkins.version=2.401.1 -Djenkins.tools.bom.artifactId=bom-2.401.x -Djenkins.tools.bom.version=2163.v2d916d90c305')
+                '-Djenkins.version=2.414.1 -Djenkins.tools.bom.artifactId=bom-2.414.x -Djenkins.tools.bom.version=2401.v7a_d68f8d0b_09')
           }
           post {
             always {
diff --git a/src/test/java/org/sonatype/nexus/ci/iq/PipelineSyntaxIntegrationTest.groovy b/src/test/java/org/sonatype/nexus/ci/iq/PipelineSyntaxIntegrationTest.groovy
index 797079a3..84ff22b7 100644
--- a/src/test/java/org/sonatype/nexus/ci/iq/PipelineSyntaxIntegrationTest.groovy
+++ b/src/test/java/org/sonatype/nexus/ci/iq/PipelineSyntaxIntegrationTest.groovy
@@ -53,6 +53,7 @@ class PipelineSyntaxIntegrationTest
     given: 'a pipleline project'
       WorkflowJob project = jenkins.createProject(WorkflowJob)
       WebClient client = jenkins.createWebClient()
+      client.getOptions().setFetchPolyfillEnabled(true)
 
     when: 'the pipeline syntax page is loaded'
       HtmlOption policyEval = selectPolicyEvaluation(client, project)
@@ -80,6 +81,7 @@ class PipelineSyntaxIntegrationTest
       configureJenkins(jenkins.jenkins, wireMockRule.port())
       WorkflowJob project = jenkins.createProject(WorkflowJob)
       WebClient client = jenkins.createWebClient()
+      client.getOptions().setFetchPolyfillEnabled(true)
 
     when: 'the pipeline syntax page is loaded'
       HtmlOption policyEval = selectPolicyEvaluation(client, project)