From 022a65d6ca1a19aec03443d26543a5e96a1dede1 Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Mon, 13 Nov 2023 15:02:38 +0000 Subject: [PATCH] ES-1621: Update JenkinsfileMergeAutomation use correct branch the 5.2 branch should set it's originBranch as 5.2 and it's target as 5.3, this is just a placeholder file for now and will not do anything until 5.3 branch exists --- .ci/JenkinsfileMergeAutomation | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/JenkinsfileMergeAutomation b/.ci/JenkinsfileMergeAutomation index 7917b94..717b5f9 100644 --- a/.ci/JenkinsfileMergeAutomation +++ b/.ci/JenkinsfileMergeAutomation @@ -14,13 +14,13 @@ * the branch name of origin branch, it should match the current branch * and it acts as a fail-safe inside {@code forwardMerger} pipeline */ -String originBranch = 'release/5.1' +String originBranch = 'release/5.2' /** * the branch name of target branch, it should be the branch with the next version * after the one in current branch. */ -String targetBranch = 'release/5.2' +String targetBranch = 'release/5.3' /** * Forward merge any changes between {@code originBranch} and {@code targetBranch} @@ -28,4 +28,4 @@ String targetBranch = 'release/5.2' forwardMerger( targetBranch: targetBranch, originBranch: originBranch, - slackChannel: '#c5-forward-merge-bot-notifications') \ No newline at end of file + slackChannel: '#c5-forward-merge-bot-notifications')