From 21baeb11c3a98ac9891fd0a3571fc471a79c3a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 18 Nov 2024 10:56:08 +0100 Subject: [PATCH 1/3] Dissociate @Library from imports in Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index afaab79c32..3a221f4812 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,8 @@ import groovy.transform.Field /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.17') +@Library('hibernate-jenkins-pipeline-helpers@1.17') _ + import org.hibernate.jenkins.pipeline.helpers.job.JobHelper import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap From c66da67b748de7219b604ff52fe5477f05cbbfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 18 Nov 2024 10:56:40 +0100 Subject: [PATCH 2/3] Upgrade to hibernate-jenkins-pipeline-helpers 1.18 To avoid buggy notifications. See https://hibernate.zulipchat.com/#narrow/channel/132096-hibernate-user/topic/Jenkins.20Notifications Full changeset: https://github.com/hibernate/hibernate-jenkins-pipeline-helpers/compare/1.17..1.18 --- Jenkinsfile | 2 +- jenkins/nightly/Jenkinsfile | 2 +- jenkins/release.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a221f4812..028be56606 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ import groovy.transform.Field /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.17') _ +@Library('hibernate-jenkins-pipeline-helpers@1.18') _ import org.hibernate.jenkins.pipeline.helpers.job.JobHelper import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap diff --git a/jenkins/nightly/Jenkinsfile b/jenkins/nightly/Jenkinsfile index c674dabbdb..c38ebf45b6 100644 --- a/jenkins/nightly/Jenkinsfile +++ b/jenkins/nightly/Jenkinsfile @@ -3,7 +3,7 @@ * Copyright Red Hat Inc. and Hibernate Authors */ -@Library('hibernate-jenkins-pipeline-helpers@1.17') _ +@Library('hibernate-jenkins-pipeline-helpers@1.18') _ def withMavenWorkspace(Closure body) { withMavenWorkspace('OpenJDK 17 Latest', body) diff --git a/jenkins/release.groovy b/jenkins/release.groovy index 2b1dc0d346..7a24be8d61 100644 --- a/jenkins/release.groovy +++ b/jenkins/release.groovy @@ -3,7 +3,7 @@ * Copyright Red Hat Inc. and Hibernate Authors */ -@Library('hibernate-jenkins-pipeline-helpers@1.17') _ +@Library('hibernate-jenkins-pipeline-helpers@1.18') _ import org.hibernate.jenkins.pipeline.helpers.version.Version From 9907279fae2ea1a2d3e9ab11c70e57758dd96a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 18 Nov 2024 11:00:08 +0100 Subject: [PATCH 3/3] Use the version of hibernate-jenkins-pipeline-helpers configured on CI Don't configure the version in Jenkinsfile so that it's easier to upgrade next time. See https://ci.hibernate.org/manage/configure#global-untrusted-pipeline-libraries to change the (default) version globally for all projects. --- Jenkinsfile | 2 +- jenkins/nightly/Jenkinsfile | 2 +- jenkins/release.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 028be56606..f5fea20d57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ import groovy.transform.Field /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ import org.hibernate.jenkins.pipeline.helpers.job.JobHelper import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap diff --git a/jenkins/nightly/Jenkinsfile b/jenkins/nightly/Jenkinsfile index c38ebf45b6..da55858e88 100644 --- a/jenkins/nightly/Jenkinsfile +++ b/jenkins/nightly/Jenkinsfile @@ -3,7 +3,7 @@ * Copyright Red Hat Inc. and Hibernate Authors */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ def withMavenWorkspace(Closure body) { withMavenWorkspace('OpenJDK 17 Latest', body) diff --git a/jenkins/release.groovy b/jenkins/release.groovy index 7a24be8d61..899b91ed89 100644 --- a/jenkins/release.groovy +++ b/jenkins/release.groovy @@ -3,7 +3,7 @@ * Copyright Red Hat Inc. and Hibernate Authors */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ import org.hibernate.jenkins.pipeline.helpers.version.Version