From 261752ab79be7c6d884ea35b9b18b5448e682d99 Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Thu, 4 Jul 2024 12:52:58 +0200 Subject: [PATCH 1/3] fix agent config for root jobs --- dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare | 8 +++++--- dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches | 8 +++++--- dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare index 717f81b9b..f42d21010 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare @@ -9,9 +9,11 @@ repositoriesToBranch = [] pipeline { agent { - image env.AGENT_DOCKER_BUILDER_IMAGE - args env.AGENT_DOCKER_BUILDER_ARGS - label util.avoidFaultyNodes('ubuntu') + docker { + image env.AGENT_DOCKER_BUILDER_IMAGE + args env.AGENT_DOCKER_BUILDER_ARGS + label util.avoidFaultyNodes('ubuntu') + } } environment { diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches b/dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches index a7d9cd6d5..e5fb18364 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.remove.branches @@ -6,9 +6,11 @@ import org.kie.jenkins.MavenCommand pipeline { agent { - image env.AGENT_DOCKER_BUILDER_IMAGE - args env.AGENT_DOCKER_BUILDER_ARGS - label util.avoidFaultyNodes('ubuntu') + docker { + image env.AGENT_DOCKER_BUILDER_IMAGE + args env.AGENT_DOCKER_BUILDER_ARGS + label util.avoidFaultyNodes('ubuntu') + } } options{ diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers b/dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers index c13488b27..5beaf6b94 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.tools.toggle-triggers @@ -5,9 +5,11 @@ import org.kie.jenkins.MavenCommand pipeline { agent { - image env.AGENT_DOCKER_BUILDER_IMAGE - args env.AGENT_DOCKER_BUILDER_ARGS - label util.avoidFaultyNodes('ubuntu') + docker { + image env.AGENT_DOCKER_BUILDER_IMAGE + args env.AGENT_DOCKER_BUILDER_ARGS + label util.avoidFaultyNodes('ubuntu') + } } options { From 92c03d08a7c2419b3d28b415ae44636e456de4da Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Thu, 4 Jul 2024 13:02:23 +0200 Subject: [PATCH 2/3] fix release prepare commit --- dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare | 1 + 1 file changed, 1 insertion(+) diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare index f42d21010..be887920e 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare @@ -75,6 +75,7 @@ pipeline { if (githubscm.isThereAnyChanges()) { sh 'git diff' + githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId()) githubscm.commitChanges('Setup DSL branch config after cut-off') githubscm.pushObject('origin', newBranch, getMainBranchConfigFileGitAuthorPushCredentialsId()) From 2ed79c331c19fa731a7865cbc900977d7078620d Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Thu, 4 Jul 2024 13:02:23 +0200 Subject: [PATCH 3/3] fix release prepare commit #2 --- dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare index be887920e..1afbfc266 100644 --- a/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare +++ b/dsl/seed/jenkinsfiles/Jenkinsfile.release.prepare @@ -75,7 +75,7 @@ pipeline { if (githubscm.isThereAnyChanges()) { sh 'git diff' - githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId()) + githubscm.setUserConfigFromCreds(getMainBranchConfigFileGitAuthorPushCredentialsId()) githubscm.commitChanges('Setup DSL branch config after cut-off') githubscm.pushObject('origin', newBranch, getMainBranchConfigFileGitAuthorPushCredentialsId())