From acf88fc6861fafaeb379cf985481030de07a129c Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Thu, 20 Jun 2024 17:18:53 -0300 Subject: [PATCH 1/2] Fix weekly Jenkins job build params --- .ci/jenkins/project/Jenkinsfile.weekly | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.ci/jenkins/project/Jenkinsfile.weekly b/.ci/jenkins/project/Jenkinsfile.weekly index 89fb97b3e99..d9710e24473 100644 --- a/.ci/jenkins/project/Jenkinsfile.weekly +++ b/.ci/jenkins/project/Jenkinsfile.weekly @@ -69,6 +69,16 @@ pipeline { def buildParams = getDefaultBuildParams() addSkipTestsParam(buildParams) addSkipIntegrationTestsParam(buildParams) + String quickstartsBranch + switch (getBuildBranch()) { + case 'main': quickstartsBranch = '8.x' + break + case '9.x': quickstartsBranch = 'development' + break + default : quickstartsBranch = getBuildBranch() + } + + addStringParam(buildParams, 'QUICKSTARTS_BUILD_BRANCH_NAME', quickstartsBranch) buildJob(OPTAPLANNER_DEPLOY, buildParams) } @@ -153,7 +163,6 @@ List getDefaultBuildParams() { List params = [] addStringParam(params, 'DISPLAY_NAME', "${env.WEEKLY_TAG}") addStringParam(params, 'GIT_CHECKOUT_DATETIME', getCheckoutDatetime()) - addStringParam(params, 'QUICKSTARTS_BUILD_BRANCH_NAME', getBuildBranch()) addBooleanParam(params, 'SEND_NOTIFICATION', true) return params From 46219a99a46fb8b374743cb7bc19357ce65a8bbd Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Fri, 21 Jun 2024 08:45:16 -0300 Subject: [PATCH 2/2] Update quickstarts build branch --- .ci/jenkins/project/Jenkinsfile.weekly | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.ci/jenkins/project/Jenkinsfile.weekly b/.ci/jenkins/project/Jenkinsfile.weekly index d9710e24473..f7e1b2c75c8 100644 --- a/.ci/jenkins/project/Jenkinsfile.weekly +++ b/.ci/jenkins/project/Jenkinsfile.weekly @@ -69,15 +69,7 @@ pipeline { def buildParams = getDefaultBuildParams() addSkipTestsParam(buildParams) addSkipIntegrationTestsParam(buildParams) - String quickstartsBranch - switch (getBuildBranch()) { - case 'main': quickstartsBranch = '8.x' - break - case '9.x': quickstartsBranch = 'development' - break - default : quickstartsBranch = getBuildBranch() - } - + String quickstartsBranch = getBuildBranch() == 'main' ? 'development' : getBuildBranch() addStringParam(buildParams, 'QUICKSTARTS_BUILD_BRANCH_NAME', quickstartsBranch) buildJob(OPTAPLANNER_DEPLOY, buildParams)