From cd035de0f82df80d6e7570f3a544aeccbdf99d21 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Mon, 15 Sep 2025 10:28:01 +0200 Subject: [PATCH] Lock around clone-commit-push in Jenkins release script --- ci/release/Jenkinsfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index 07c3fc97be63..1df511ffc63f 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -256,12 +256,15 @@ pipeline { ]) { sshagent( ['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net'] ) { dir( '.release/hibernate.org' ) { - checkout scmGit( - branches: [[name: '*/production']], - extensions: [], - userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/hibernate/hibernate.org.git']] - ) - sh "../scripts/website-release.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION}" + // Lock to avoid rejected pushes when multiple releases try to clone-commit-push + lock('hibernate.org-git') { + checkout scmGit( + branches: [[name: '*/production']], + extensions: [], + userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/hibernate/hibernate.org.git']] + ) + sh "../scripts/website-release.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION}" + } } } }