This is an automated email from the ASF dual-hosted git repository. radtriste pushed a commit to branch kiegroup_to_apache in repository https://gitbox.apache.org/repos/asf/incubator-kie-optaplanner.git
commit 0c856b016a510ecb118495fee11172e61a6e22a4 Author: radtriste <[email protected]> AuthorDate: Tue Sep 12 14:56:23 2023 +0200 various updates --- .ci/jenkins/Jenkinsfile | 2 +- .ci/jenkins/config/branch.yaml | 5 +- .ci/jenkins/dsl/jobs.groovy | 1 - .ci/jenkins/project/Jenkinsfile.post-release | 69 ++++++++++++++-------------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile index 8728defbcc..8f360bd068 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { } environment { BUILDCHAIN_PROJECT = 'apache/incubator-kie-optaplanner' - BUILDCHAIN_CONFIG_REPO = 'optaplanner' + BUILDCHAIN_CONFIG_REPO = 'incubator-kie-optaplanner' BUILDCHAIN_CONFIG_FILE_PATH = '.ci/buildchain-config.yaml' ENABLE_SONARCLOUD = 'true' diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml index 5efa3de00a..7ac642ad51 100644 --- a/.ci/jenkins/config/branch.yaml +++ b/.ci/jenkins/config/branch.yaml @@ -29,8 +29,9 @@ repositories: - name: incubator-kie-optaplanner-quickstarts job_display_name: optaplanner-quickstarts branch: 8.x -- name: incubator-kie-optaplanner-website - job_display_name: optaplanner-website +# Not migrated to Apache yet +# - name: incubator-kie-optaplanner-website +# job_display_name: optaplanner-website - name: incubator-kie-kie-benchmarks job_display_name: kie-benchmarks author: diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index b7dcde675a..8f33343d08 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -236,7 +236,6 @@ void createSetupBranchJob() { def jobParams = JobParamsUtils.getBasicJobParams(this, 'optaplanner', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'OptaPlanner Setup Branch') JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams) jobParams.env.putAll([ - REPO_NAME: 'optaplanner', JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}", GIT_AUTHOR: "${GIT_AUTHOR_NAME}", diff --git a/.ci/jenkins/project/Jenkinsfile.post-release b/.ci/jenkins/project/Jenkinsfile.post-release index bf812b5633..4a4bfb8c21 100644 --- a/.ci/jenkins/project/Jenkinsfile.post-release +++ b/.ci/jenkins/project/Jenkinsfile.post-release @@ -82,40 +82,41 @@ pipeline { } } - stage('Update OptaPlanner website') { - steps { - script { - final String websiteRepository = 'optaplanner-website' - String prLink = null - String prBranchName = "${getProjectVersion().toLowerCase()}-${env.PR_BRANCH_HASH}" - dir("$websiteRepository-pr") { - checkoutRepo(websiteRepository, 'main') // there is no other branch - githubscm.createBranch(prBranchName) - - // Update versions in links on the website and in the docs. - sh "./build/update-versions.sh ${getProjectVersion()} ${getNextMinorSnapshotVersion(getProjectVersion())}" - - // Update the XSDs. OptaPlanner must be cloned and build with the full profile before. - String optaplannerRoot = "${WORKSPACE}/${optaplannerRepository}" - String optaplannerWebsiteModule = 'optaplanner-website-root' - String optaplannerWebsiteXsd = "${optaplannerWebsiteModule}/content/xsd" - String optaplannerWebsiteDocs = 'optaplanner-website-docs' - sh "cp ${optaplannerRoot}/core/optaplanner-core-impl/target/classes/solver.xsd ${optaplannerWebsiteXsd}/solver/solver-${env.OPTAPLANNER_LATEST_STREAM}.xsd" - sh "cp ${optaplannerRoot}/optaplanner-benchmark/target/classes/benchmark.xsd ${optaplannerWebsiteXsd}/benchmark/benchmark-${env.OPTAPLANNER_LATEST_STREAM}.xsd" - - // Add changed files, commit, open and merge PR - prLink = commitAndCreatePR("Release OptaPlanner ${getProjectVersion()}", - { sh "git add $optaplannerWebsiteXsd/\\*.xsd $optaplannerWebsiteModule/data/pom.yml $optaplannerWebsiteDocs/antora-playbook.yml" }, - prBranchName, 'main') - } - dir(websiteRepository) { - checkoutRepo(websiteRepository, 'main') - mergeAndPush(prLink, 'main') - githubscm.removeRemoteBranch('origin', prBranchName, getGitAuthorCredsID()) - } - } - } - } + // Optaplanner website is not migrated to Apache + // stage('Update OptaPlanner website') { + // steps { + // script { + // final String websiteRepository = 'optaplanner-website' + // String prLink = null + // String prBranchName = "${getProjectVersion().toLowerCase()}-${env.PR_BRANCH_HASH}" + // dir("$websiteRepository-pr") { + // checkoutRepo(websiteRepository, 'main') // there is no other branch + // githubscm.createBranch(prBranchName) + + // // Update versions in links on the website and in the docs. + // sh "./build/update-versions.sh ${getProjectVersion()} ${getNextMinorSnapshotVersion(getProjectVersion())}" + + // // Update the XSDs. OptaPlanner must be cloned and build with the full profile before. + // String optaplannerRoot = "${WORKSPACE}/${optaplannerRepository}" + // String optaplannerWebsiteModule = 'optaplanner-website-root' + // String optaplannerWebsiteXsd = "${optaplannerWebsiteModule}/content/xsd" + // String optaplannerWebsiteDocs = 'optaplanner-website-docs' + // sh "cp ${optaplannerRoot}/core/optaplanner-core-impl/target/classes/solver.xsd ${optaplannerWebsiteXsd}/solver/solver-${env.OPTAPLANNER_LATEST_STREAM}.xsd" + // sh "cp ${optaplannerRoot}/optaplanner-benchmark/target/classes/benchmark.xsd ${optaplannerWebsiteXsd}/benchmark/benchmark-${env.OPTAPLANNER_LATEST_STREAM}.xsd" + + // // Add changed files, commit, open and merge PR + // prLink = commitAndCreatePR("Release OptaPlanner ${getProjectVersion()}", + // { sh "git add $optaplannerWebsiteXsd/\\*.xsd $optaplannerWebsiteModule/data/pom.yml $optaplannerWebsiteDocs/antora-playbook.yml" }, + // prBranchName, 'main') + // } + // dir(websiteRepository) { + // checkoutRepo(websiteRepository, 'main') + // mergeAndPush(prLink, 'main') + // githubscm.removeRemoteBranch('origin', prBranchName, getGitAuthorCredsID()) + // } + // } + // } + // } } post { unsuccessful { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
