This is an automated email from the ASF dual-hosted git repository.
porcelli pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-optaplanner.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3384ac3ba6 10.1.0 release: updating ci content with 10.0.x state
(manually)
3384ac3ba6 is described below
commit 3384ac3ba6c34a8dd4fda7cc9aedee8828470a35
Author: Alex Porcelli <[email protected]>
AuthorDate: Thu Mar 27 10:36:04 2025 -0400
10.1.0 release: updating ci content with 10.0.x state (manually)
---
.ci/jenkins/Jenkinsfile | 2 +-
.ci/jenkins/Jenkinsfile.deploy | 2 +-
.ci/jenkins/Jenkinsfile.promote | 2 +-
.ci/jenkins/Jenkinsfile.setup-branch | 2 +-
.ci/jenkins/Jenkinsfile.turtle | 4 +-
.ci/jenkins/Jenkinsfile.weekly.deploy | 10 +-
.ci/jenkins/config/branch.yaml | 20 ++--
.ci/jenkins/config/main.yaml | 37 ++++--
.ci/jenkins/dsl/jobs.groovy | 204 ++++++++++++++++----------------
.ci/jenkins/dsl/test.sh | 2 +-
.ci/jenkins/project/Jenkinsfile.drools | 2 +-
.ci/jenkins/project/Jenkinsfile.nightly | 4 +-
.ci/jenkins/project/Jenkinsfile.release | 2 +-
.ci/jenkins/project/Jenkinsfile.weekly | 2 +-
14 files changed, 155 insertions(+), 140 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 7bcdd80339..d17a9103d5 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -66,4 +66,4 @@ pipeline {
cleanWs()
}
}
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 854766ca68..a9681bc7cf 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -554,4 +554,4 @@ String getReleaseGpgSignPassphraseCredsId() {
String getGitTagName() {
return params.GIT_TAG_NAME
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index ea346cee3d..a793207cd6 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -320,4 +320,4 @@ void removeOperatorImageTemporaryTag() {
getOperatorImageTemporaryTag())
// https://docs.docker.com/docker-hub/api/latest/#tag/repositories
error "Dockerhub API does not allow deleting tags via API. The OptaPlanner
Operator temporary image tag (${temporaryImageName}) should be removed
manually."
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch
b/.ci/jenkins/Jenkinsfile.setup-branch
index d210e9c40c..be3a964790 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -162,4 +162,4 @@ MavenCommand getMavenCommand() {
boolean isMainBranch() {
return env.IS_MAIN_BRANCH ? env.IS_MAIN_BRANCH.toBoolean() : false
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.turtle b/.ci/jenkins/Jenkinsfile.turtle
index 9d0174e4dd..be22ada863 100644
--- a/.ci/jenkins/Jenkinsfile.turtle
+++ b/.ci/jenkins/Jenkinsfile.turtle
@@ -25,7 +25,7 @@ optaplannerRepo = 'incubator-kie-optaplanner'
pipeline {
agent {
- docker {
+ docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
label util.avoidFaultyNodes()
@@ -117,4 +117,4 @@ String getNotificationAdditionalInfo() {
**[${getBuildBranch()}] Optaplanner - Turtle tests**
**${getConstraintStreamImplType()}**
"""
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy
b/.ci/jenkins/Jenkinsfile.weekly.deploy
index 58d3fda179..7ae4d757e3 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -158,13 +158,7 @@ pipeline {
script {
projectVersion = getProjectVersion(false)
dir(optaplannerFolder) {
- if (githubscm.isThereAnyChanges()) {
- def commitMsg = "[${getBuildBranch()}] Update
version to ${projectVersion}"
-
githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
- githubscm.commitChanges(commitMsg, {
githubscm.findAndStageNotIgnoredFiles('pom.xml') })
- } else {
- println '[WARN] no changes to commit'
- }
+
githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
githubscm.tagRepository(projectVersion)
githubscm.pushRemoteTag('origin', projectVersion,
getGitAuthorPushCredsId())
}
@@ -324,4 +318,4 @@ String getProjectVersion(boolean keepSnapshotSuffix = true)
{
return projectVersion.replace('-SNAPSHOT',
"-${getProjectVersionDate()}-SNAPSHOT")
}
return projectVersion.replace('-SNAPSHOT', "-${getProjectVersionDate()}")
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
index 1d48d5af5d..1dca4c0b50 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -7,19 +7,19 @@ environments:
BUILD_MVN_OPTS_CURRENT: -Dnative -Dquarkus.native.container-build=true
ADDITIONAL_TIMEOUT: 720
ids:
- - native
+ - native
ecosystem:
auto_generation: false
ids:
- - ecosystem
+ - ecosystem
repositories:
-- name: incubator-kie-optaplanner
- job_display_name: optaplanner
- branch: 10.1.x
- is_branch_config_repo: true
-- name: incubator-kie-optaplanner-quickstarts
- job_display_name: optaplanner-quickstarts
- branch: 10.1.x
+ - name: incubator-kie-optaplanner
+ job_display_name: optaplanner
+ branch: 10.1.x
+ is_branch_config_repo: true
+ - name: incubator-kie-optaplanner-quickstarts
+ job_display_name: optaplanner-quickstarts
+ branch: 10.1.x
git:
author:
name: apache
@@ -86,4 +86,4 @@ jenkins:
default_tools:
jdk: jdk_17_latest
maven: maven_3.9.3
- sonar_jdk: jdk_17_latest
+ sonar_jdk: jdk_17_latest
\ No newline at end of file
diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml
index 2ca7a75598..0372415a70 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -1,14 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
ecosystem:
main_project: optaplanner
projects:
- - name: optaplanner
- regexs:
- - incubator-kie-opta.*
- - opta.*
- - name: kie-benchmarks
- ignore_release: true
- regexs:
- - incubator-kie-benchmarks.*
+ - name: optaplanner
+ regexs:
+ - incubator-kie-opta.*
+ - opta.*
+ - name: kie-benchmarks
+ ignore_release: true
+ regexs:
+ - incubator-kie-benchmarks.*
git:
branches:
- name: main
@@ -32,5 +48,8 @@ jenkins:
agent:
docker:
builder:
+ # At some point, this image will need to be changed when a release
branch is created
+ # but we need to make sure the image exists first ... simple tag
before setting up the branch ?
+ # See https://github.com/kiegroup/kie-issues/issues/551
image: docker.io/apache/incubator-kie-kogito-ci-build:main-latest
- args: --privileged --group-add docker
+ args: --privileged --group-add docker
\ No newline at end of file
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index cb3731a4da..5292c918d4 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -72,12 +72,12 @@ void setupProjectDroolsJob(String droolsBranch) {
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.triggers = [ cron : 'H 2 * * *' ]
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- NOTIFICATION_JOB_NAME: 'Drools snapshot check',
- DROOLS_BRANCH: droolsBranch,
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ NOTIFICATION_JOB_NAME: 'Drools snapshot check',
+ DROOLS_BRANCH: droolsBranch,
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -90,13 +90,13 @@ void setupProjectDroolsJob(String droolsBranch) {
void createProjectSetupBranchJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this, '0-setup-branch',
JobType.SETUP_BRANCH, "${jenkins_path_project}/Jenkinsfile.setup-branch",
'Optaplanner Project Setup Branch')
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_BRANCH_NAME: "${GIT_BRANCH}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_BRANCH_NAME: "${GIT_BRANCH}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
+ IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -110,15 +110,15 @@ void setupProjectNightlyJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner-nightly', JobType.NIGHTLY,
"${jenkins_path_project}/Jenkinsfile.nightly", 'Optaplanner Nightly')
jobParams.triggers = [cron : '@midnight']
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_BRANCH_NAME: "${GIT_BRANCH}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_BRANCH_NAME: "${GIT_BRANCH}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
- ARTIFACTS_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
+ ARTIFACTS_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -131,9 +131,9 @@ void setupProjectWeeklyJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this, '0-weekly',
JobType.OTHER, "${jenkins_path_project}/Jenkinsfile.weekly", 'Optaplanner
Weekly')
jobParams.triggers = [cron : '0 5 * * 0']
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_BRANCH_NAME: "${GIT_BRANCH}",
+ GIT_BRANCH_NAME: "${GIT_BRANCH}",
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -145,10 +145,10 @@ void setupProjectWeeklyJob() {
void setupProjectReleaseJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner-release', JobType.RELEASE,
"${jenkins_path_project}/Jenkinsfile.release", 'Optaplanner Release')
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_BRANCH_NAME: "${GIT_BRANCH}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_BRANCH_NAME: "${GIT_BRANCH}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -167,18 +167,18 @@ void setupProjectPostReleaseJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner-post-release', JobType.RELEASE,
"${jenkins_path_project}/Jenkinsfile.post-release", 'Optaplanner Post Release')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.RELEASE.name),
- MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.RELEASE.name),
+ MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- GITHUB_CLI_VERSION: '0.11.1',
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
+ GITHUB_CLI_VERSION: '0.11.1',
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -200,28 +200,28 @@ void setupProjectPostReleaseJob() {
Map getMultijobPRConfig(JenkinsFolder jobFolder) {
def jobConfig = [
- parallel: true,
- buildchain: true,
- jobs : [
- [
- id: 'optaplanner',
- primary: true,
- env : [
- // Sonarcloud analysis only on main branch
- // As we have only Community edition
- ENABLE_SONARCLOUD: EnvUtils.isDefaultEnvironment(this,
jobFolder.getEnvironmentName()) && Utils.isMainBranch(this),
- SONARCLOUD_ANALYSIS_MVN_OPTS:
'-Dsonar.projectKey=apache_incubator-kie-optaplanner',
- ]
- ], [
- id: 'optaplanner-quickstarts',
- repository: 'incubator-kie-optaplanner-quickstarts',
- env : [
- BUILD_MVN_OPTS_CURRENT: '-Dfull',
- OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM: '-Dfull',
- MIGRATE_TO_9: Utils.isMainBranch(this)
- ]
+ parallel: true,
+ buildchain: true,
+ jobs : [
+ [
+ id: 'optaplanner',
+ primary: true,
+ env : [
+ // Sonarcloud analysis only on main branch
+ // As we have only Community edition
+ ENABLE_SONARCLOUD:
EnvUtils.isDefaultEnvironment(this, jobFolder.getEnvironmentName()) &&
Utils.isMainBranch(this),
+ SONARCLOUD_ANALYSIS_MVN_OPTS:
'-Dsonar.projectKey=apache_incubator-kie-optaplanner',
+ ]
+ ], [
+ id: 'optaplanner-quickstarts',
+ repository:
'incubator-kie-optaplanner-quickstarts',
+ env : [
+ BUILD_MVN_OPTS_CURRENT: '-Dfull',
+ OPTAPLANNER_BUILD_MVN_OPTS_UPSTREAM:
'-Dfull',
+ MIGRATE_TO_9: Utils.isMainBranch(this)
+ ]
+ ]
]
- ]
]
return jobConfig
}
@@ -250,14 +250,14 @@ if (Utils.isMainBranch(this)) {
// Tools folder
KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'optaplanner', [
- modules: [ 'optaplanner-build-parent' ],
- compare_deps_remote_poms: [ 'io.quarkus:quarkus-bom' ],
- properties: [ 'version.io.quarkus' ],
+ modules: [ 'optaplanner-build-parent' ],
+ compare_deps_remote_poms: [ 'io.quarkus:quarkus-bom' ],
+ properties: [ 'version.io.quarkus' ],
])
KogitoJobUtils.createVersionUpdateToolsJob(this, 'optaplanner', 'Drools', [
- modules: [ 'optaplanner-build-parent' ],
- properties: [ 'version.org.drools' ],
+ modules: [ 'optaplanner-build-parent' ],
+ properties: [ 'version.org.drools' ],
])
void setupSpecificBuildChainNightlyJob(String envName) {
@@ -268,16 +268,16 @@ 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([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
- IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
+ IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -301,36 +301,36 @@ void setupDeployJob(JobType jobType, String envName = '')
{
jobParams.git.project_url =
Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
}
jobParams.env.putAll([
- PROPERTIES_FILE_NAME: 'deployment.properties',
+ PROPERTIES_FILE_NAME: 'deployment.properties',
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, jobType.name),
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}",
- DISABLE_DEPLOY: Utils.isDeployDisabled(this),
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, jobType.name),
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}",
+ DISABLE_DEPLOY: Utils.isDeployDisabled(this),
- RELEASE_GPG_SIGN_KEY_CREDS_ID:
Utils.getReleaseGpgSignKeyCredentialsId(this),
- RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID:
Utils.getReleaseGpgSignPassphraseCredentialsId(this)
+ RELEASE_GPG_SIGN_KEY_CREDS_ID:
Utils.getReleaseGpgSignKeyCredentialsId(this),
+ RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID:
Utils.getReleaseGpgSignPassphraseCredentialsId(this)
])
if (jobType == JobType.PULL_REQUEST) {
jobParams.env.putAll([
- MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
- MAVEN_DEPLOY_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
- MAVEN_REPO_CREDS_ID: "${MAVEN_PR_CHECKS_REPOSITORY_CREDS_ID}",
+ MAVEN_DEPENDENCIES_REPOSITORY:
"${MAVEN_PR_CHECKS_REPOSITORY_URL}",
+ MAVEN_DEPLOY_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
+ MAVEN_REPO_CREDS_ID: "${MAVEN_PR_CHECKS_REPOSITORY_CREDS_ID}",
])
} else {
jobParams.env.putAll([
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
- MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- MAVEN_DEPLOY_REPOSITORY:
Utils.getMavenArtifactsUploadRepositoryUrl(this, jobType.name),
- MAVEN_REPO_CREDS_ID:
Utils.getMavenArtifactsUploadRepositoryCredentialsId(this, jobType.name),
+ MAVEN_DEPLOY_REPOSITORY:
Utils.getMavenArtifactsUploadRepositoryUrl(this, jobType.name),
+ MAVEN_REPO_CREDS_ID:
Utils.getMavenArtifactsUploadRepositoryCredentialsId(this, jobType.name),
- OPERATOR_IMAGE_NAME: 'optaplanner-operator',
- MAX_REGISTRY_RETRIES: 3,
+ OPERATOR_IMAGE_NAME: 'optaplanner-operator',
+ MAX_REGISTRY_RETRIES: 3,
])
}
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
@@ -375,20 +375,20 @@ void setupPromoteJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner-promote', JobType.RELEASE, "${jenkins_path}/Jenkinsfile.promote",
'Optaplanner Promote')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.RELEASE.name),
- MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.RELEASE.name),
+ MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- PROPERTIES_FILE_NAME: 'deployment.properties',
- GITHUB_CLI_VERSION: '0.11.1',
- OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
+ PROPERTIES_FILE_NAME: 'deployment.properties',
+ GITHUB_CLI_VERSION: '0.11.1',
+ OPTAPLANNER_LATEST_STREAM: "${GIT_MAIN_BRANCH}"
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -436,19 +436,19 @@ void setupWeeklyDeployJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'optaplanner.weekly-deploy', JobType.OTHER,
"${jenkins_path}/Jenkinsfile.weekly.deploy", 'Optaplanner Weekly Deploy')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
- PROPERTIES_FILE_NAME: 'deployment.properties',
- JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+ PROPERTIES_FILE_NAME: 'deployment.properties',
+ JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
- GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+ GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+ GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
- MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
- MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
- MAVEN_DEPLOY_REPOSITORY:
Utils.getMavenArtifactsUploadRepositoryUrl(this, JobType.NIGHTLY.name),
- MAVEN_REPO_CREDS_ID:
Utils.getMavenArtifactsUploadRepositoryCredentialsId(this,
JobType.NIGHTLY.name),
+ MAVEN_SETTINGS_CONFIG_FILE_ID:
Utils.getMavenSettingsConfigFileId(this, JobType.NIGHTLY.name),
+ MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+ MAVEN_DEPLOY_REPOSITORY:
Utils.getMavenArtifactsUploadRepositoryUrl(this, JobType.NIGHTLY.name),
+ MAVEN_REPO_CREDS_ID:
Utils.getMavenArtifactsUploadRepositoryCredentialsId(this,
JobType.NIGHTLY.name),
- DISABLE_DEPLOY: Utils.isDeployDisabled(this),
+ DISABLE_DEPLOY: Utils.isDeployDisabled(this),
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -465,4 +465,4 @@ void setupWeeklyDeployJob() {
booleanParam('SEND_NOTIFICATION', false, 'In case you want the
pipeline to send a notification on CI channel for this run.')
}
}
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index e534696a95..d412c5b3e0 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -50,4 +50,4 @@ file=$(mktemp)
# For more usage of the script, use ./test.sh -h
curl -o ${file}
https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
chmod u+x ${file}
-${file} $@
+${file} $@
\ No newline at end of file
diff --git a/.ci/jenkins/project/Jenkinsfile.drools
b/.ci/jenkins/project/Jenkinsfile.drools
index c8a9a456c7..79fe5990eb 100644
--- a/.ci/jenkins/project/Jenkinsfile.drools
+++ b/.ci/jenkins/project/Jenkinsfile.drools
@@ -196,4 +196,4 @@ String getGitAuthorCredsId() {
void cleanContainers() {
cloud.cleanContainersAndImages('docker')
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/project/Jenkinsfile.nightly
b/.ci/jenkins/project/Jenkinsfile.nightly
index 3607906055..0339dc30b0 100644
--- a/.ci/jenkins/project/Jenkinsfile.nightly
+++ b/.ci/jenkins/project/Jenkinsfile.nightly
@@ -88,7 +88,9 @@ pipeline {
addSkipIntegrationTestsParam(buildParams)
String quickstartsBranch
switch (getBuildBranch()) {
- case 'main': quickstartsBranch = 'development'
+ case 'main': quickstartsBranch = '8.x'
+ break
+ case '9.x': quickstartsBranch = 'development'
break
default : quickstartsBranch = getBuildBranch()
}
diff --git a/.ci/jenkins/project/Jenkinsfile.release
b/.ci/jenkins/project/Jenkinsfile.release
index 2119bc50cf..1dc5298c10 100644
--- a/.ci/jenkins/project/Jenkinsfile.release
+++ b/.ci/jenkins/project/Jenkinsfile.release
@@ -337,4 +337,4 @@ void setArtifactsStaged() {
String getGitTagName() {
return params.GIT_TAG_NAME ?: getReleaseProperty('git.tag.name')
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/project/Jenkinsfile.weekly
b/.ci/jenkins/project/Jenkinsfile.weekly
index f7e1b2c75c..cdda5ff42b 100644
--- a/.ci/jenkins/project/Jenkinsfile.weekly
+++ b/.ci/jenkins/project/Jenkinsfile.weekly
@@ -186,4 +186,4 @@ String getCurrentDate() {
String getCheckoutDatetime() {
return getCurrentDate() + ' 02:00' // Cut-off 02:00AM
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
