From 296d6e9f0edf34ca533670096b1fbce06f302493 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 27 Aug 2023 11:50:33 -0600 Subject: [PATCH] Reduce Jenkinsfile diffs to archetype Use the Jenkins plugin archetype as much as possible as we can so that the differences to the archetype are clear and intentionally used. Tests with Java 21 on Linux and Java 17 on Windows. Accepts that tests on Java 11 are redundant since we've not detected relevant issues that are specific to Java 11. Confirmed that tests pass on Linux with Java 17 and Java 21. Rely on ci.jenkins.io to test Windows. Does not includes forkCount setting because it does not improve test performance on this repository. --- Jenkinsfile | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65301fa..9bdbcc7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,18 +1,10 @@ -#!/usr/bin/env groovy - -/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ +/* + See the documentation for more options: + https://github.com/jenkins-infra/pipeline-library/ +*/ buildPlugin( - // Container agents start faster and are easier to administer - useContainerAgent: true, - // Show failures on all configurations - failFast: false, - // Opt-in to the Artifact Caching Proxy, to be removed when it will be opt-out. - // See https://github.com/jenkins-infra/helpdesk/issues/2752 for more details and updates. - artifactCachingProxyEnabled: true, - // Test Java 11, 17, and 21 + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests configurations: [ - [platform: 'linux', jdk: '17'], - [platform: 'linux', jdk: '21', jenkins: '2.414'], - [platform: 'windows', jdk: '11'] - ] -) + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], +])