You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ra...@apache.org on 2023/09/12 12:59:36 UTC
[incubator-kie-optaplanner] branch kiegroup_to_apache updated (b505200485 -> 0c856b016a)
This is an automated email from the ASF dual-hosted git repository.
radtriste pushed a change to branch kiegroup_to_apache
in repository https://gitbox.apache.org/repos/asf/incubator-kie-optaplanner.git
from b505200485 update references
new 9e0b9589a9 updated repo names
new 30759f4ee2 updated config with job_display_name
new 0c856b016a various updates
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.ci/jenkins/Jenkinsfile | 4 +-
.ci/jenkins/Jenkinsfile.deploy | 4 +-
.ci/jenkins/Jenkinsfile.promote | 4 +-
.ci/jenkins/Jenkinsfile.turtle | 2 +-
.ci/jenkins/config/branch.yaml | 16 ++++--
.ci/jenkins/config/main.yaml | 5 +-
.ci/jenkins/dsl/jobs.groovy | 1 -
.ci/jenkins/project/Jenkinsfile.drools | 6 +--
.ci/jenkins/project/Jenkinsfile.nightly | 2 +-
.ci/jenkins/project/Jenkinsfile.post-release | 73 ++++++++++++++--------------
10 files changed, 62 insertions(+), 55 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
[incubator-kie-optaplanner] 02/03: updated config with job_display_name
Posted by ra...@apache.org.
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 30759f4ee25e06817797dc8d154ea96475dd59e9
Author: radtriste <tr...@redhat.com>
AuthorDate: Tue Sep 12 11:16:35 2023 +0200
updated config with job_display_name
---
.ci/jenkins/config/branch.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
index 3dae406ff6..5efa3de00a 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -25,10 +25,14 @@ disable:
triggers: true # TODO to set back
repositories:
- name: incubator-kie-optaplanner
+ job_display_name: optaplanner
- name: incubator-kie-optaplanner-quickstarts
+ job_display_name: optaplanner-quickstarts
branch: 8.x
- name: incubator-kie-optaplanner-website
+ job_display_name: optaplanner-website
- name: incubator-kie-kie-benchmarks
+ job_display_name: kie-benchmarks
author:
name: radtriste # TODO set back. Could not push to kiegroup
git:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
[incubator-kie-optaplanner] 03/03: various updates
Posted by ra...@apache.org.
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 <tr...@redhat.com>
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: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
[incubator-kie-optaplanner] 01/03: updated repo names
Posted by ra...@apache.org.
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 9e0b9589a9b1b160d8db38a49028680a5af71e61
Author: radtriste <tr...@redhat.com>
AuthorDate: Tue Sep 12 10:47:31 2023 +0200
updated repo names
---
.ci/jenkins/Jenkinsfile | 2 +-
.ci/jenkins/Jenkinsfile.deploy | 4 ++--
.ci/jenkins/Jenkinsfile.promote | 4 ++--
.ci/jenkins/Jenkinsfile.turtle | 2 +-
.ci/jenkins/config/branch.yaml | 11 ++++++-----
.ci/jenkins/config/main.yaml | 5 +++--
.ci/jenkins/project/Jenkinsfile.drools | 6 +++---
.ci/jenkins/project/Jenkinsfile.nightly | 2 +-
.ci/jenkins/project/Jenkinsfile.post-release | 4 ++--
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 009fc44424..8728defbcc 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
script {
// load `pr_check.groovy` file from kogito-pipelines:main
dir('kogito-pipelines') {
- checkout(githubscm.resolveRepository('kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
+ checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
pr_check_script = load 'dsl/scripts/pr_check.groovy'
}
}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index a424d85535..e1e895a708 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -7,8 +7,8 @@ import org.kie.jenkins.MavenStagingHelper
deployProperties = [:]
-optaplannerRepository = 'optaplanner'
-quickstartsRepository = 'optaplanner-quickstarts'
+optaplannerRepository = 'incubator-kie-optaplanner'
+quickstartsRepository = 'incubator-kie-optaplanner-quickstarts'
imageUtils = null
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 1650f97a06..341460b3e4 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -6,8 +6,8 @@ import org.kie.jenkins.MavenCommand
deployProperties = [:]
pipelineProperties = [:]
-String optaplannerRepository = 'optaplanner'
-String quickstartsRepository = 'optaplanner-quickstarts'
+String optaplannerRepository = 'incubator-kie-optaplanner'
+String quickstartsRepository = 'incubator-kie-optaplanner-quickstarts'
imageUtils = null
diff --git a/.ci/jenkins/Jenkinsfile.turtle b/.ci/jenkins/Jenkinsfile.turtle
index 598a677abe..2130facecb 100644
--- a/.ci/jenkins/Jenkinsfile.turtle
+++ b/.ci/jenkins/Jenkinsfile.turtle
@@ -2,7 +2,7 @@
import org.kie.jenkins.MavenCommand
-optaplannerRepo = 'optaplanner'
+optaplannerRepo = 'incubator-kie-optaplanner'
pipeline {
agent {
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
index 50201a8a83..3dae406ff6 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -24,10 +24,11 @@ environments:
disable:
triggers: true # TODO to set back
repositories:
-- name: optaplanner
-- name: optaplanner-quickstarts
-- name: optaplanner-website
-- name: kie-benchmarks
+- name: incubator-kie-optaplanner
+- name: incubator-kie-optaplanner-quickstarts
+ branch: 8.x
+- name: incubator-kie-optaplanner-website
+- name: incubator-kie-kie-benchmarks
author:
name: radtriste # TODO set back. Could not push to kiegroup
git:
@@ -48,7 +49,7 @@ git:
jenkins_config_path: .ci/jenkins
buildchain_config:
git:
- repository: optaplanner
+ repository: incubator-kie-optaplanner
file_path: .ci/buildchain-config.yaml
maven:
settings_file_id: kie-release-settings
diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml
index c2bd171b93..94af2d9421 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -3,11 +3,12 @@ ecosystem:
projects:
- name: optaplanner
regexs:
+ - incubator-kie-opta.*
- opta.*
- name: kie-benchmarks
ignore_release: true
regexs:
- - kie-benchmarks.*
+ - incubator-kie-kie-benchmarks.*
git:
branches:
- name: main
@@ -15,7 +16,7 @@ git:
seed:
config_file:
git:
- repository: optaplanner
+ repository: incubator-kie-optaplanner
author:
name: apache
credentials_id: kie-ci5
diff --git a/.ci/jenkins/project/Jenkinsfile.drools b/.ci/jenkins/project/Jenkinsfile.drools
index a9c7f5fd5b..6c6c1d7471 100644
--- a/.ci/jenkins/project/Jenkinsfile.drools
+++ b/.ci/jenkins/project/Jenkinsfile.drools
@@ -2,9 +2,9 @@
import org.kie.jenkins.MavenCommand
-droolsRepo = 'drools'
-optaplannerRepo = 'optaplanner'
-quickstartsRepo = 'optaplanner-quickstarts'
+droolsRepo = 'incubator-kie-drools'
+optaplannerRepo = 'incubator-kie-optaplanner'
+quickstartsRepo = 'incubator-kie-optaplanner-quickstarts'
pipeline {
agent {
diff --git a/.ci/jenkins/project/Jenkinsfile.nightly b/.ci/jenkins/project/Jenkinsfile.nightly
index baccc16611..63234592fb 100644
--- a/.ci/jenkins/project/Jenkinsfile.nightly
+++ b/.ci/jenkins/project/Jenkinsfile.nightly
@@ -1,7 +1,7 @@
import org.jenkinsci.plugins.workflow.libs.Library
@Library('jenkins-pipeline-shared-libraries')_
-String optaPlannerRepository = 'optaplanner'
+String optaPlannerRepository = 'incubator-kie-optaplanner'
String optaPlannerMainBranch = 'main'
String optaPlanner9xBranch = '9.x'
diff --git a/.ci/jenkins/project/Jenkinsfile.post-release b/.ci/jenkins/project/Jenkinsfile.post-release
index bde6c8c5c1..bf812b5633 100644
--- a/.ci/jenkins/project/Jenkinsfile.post-release
+++ b/.ci/jenkins/project/Jenkinsfile.post-release
@@ -4,8 +4,8 @@ import org.jenkinsci.plugins.workflow.libs.Library
import org.kie.jenkins.MavenCommand
-String optaplannerRepository = 'optaplanner'
-String quickstartsRepository = 'optaplanner-quickstarts'
+String optaplannerRepository = 'incubator-kie-optaplanner'
+String quickstartsRepository = 'incubator-kie-optaplanner-quickstarts'
String stableBranchName = 'stable'
pipeline {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org