From e11e69fa425827aecbb468c66ba9a648f71e612c Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 27 Aug 2023 11:49:21 -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. Includes forkCount setting because it improves test performance on ci.jenkins.io and reduces cost on ci.jenkins.io. --- Jenkinsfile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 583bda0b..71ce5ff1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,11 @@ -#!/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, - // Test Java 11, 17, and 21 + forkCount: '1C', // Run parallel tests on ci.jenkins.io for lower costs, faster feedback + 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], +])