This is an automated email from the ASF dual-hosted git repository.
rantunes pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d59145e952 Revert "Use default maven settings file for release
(#6047)" (#6048)
d59145e952 is described below
commit d59145e9526d3373cdd4101b5e449ac7f2cda751
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Thu Aug 15 09:02:00 2024 -0300
Revert "Use default maven settings file for release (#6047)" (#6048)
This reverts commit 1320d83a40b8a5659c2c2a7cb3e9daf924cce309.
---
.ci/jenkins/Jenkinsfile.deploy | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e0bb64c0a7..b3d950ac95 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -114,32 +114,28 @@ pipeline {
stage('Deploy drools') {
steps {
script {
- def installOrDeploy
- if (shouldDeployToRepository()) {
- installOrDeploy = 'deploy -DdeployAtEnd
-DretryFailedDeploymentCount=5'
- } else {
- installOrDeploy = 'install'
- }
- def mavenCommand = getMavenCommand()
- .withOptions(env.DROOLS_BUILD_MVN_OPTS ? [
env.DROOLS_BUILD_MVN_OPTS ] : [])
- .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [
env.BUILD_MVN_OPTS_CURRENT ] : [])
- .withProperty('maven.test.failure.ignore', true)
- .skipTests(params.SKIP_TESTS)
-
- if (isRelease()) {
-
releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
- mavenCommand.withProfiles(['apache-release'])
- } else {
- configFileProvider([configFile(fileId:
env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
-
mavenCommand.withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+ withCredentials([usernamePassword(credentialsId:
env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable:
'REPOSITORY_TOKEN')]) {
+ def installOrDeploy
+ if (shouldDeployToRepository()) {
+ installOrDeploy = "deploy -DdeployAtEnd
-Dapache.repository.username=${REPOSITORY_USER}
-Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5"
+ } else {
+ installOrDeploy = 'install'
+ }
+ def mavenCommand = getMavenCommand()
+ .withOptions(env.DROOLS_BUILD_MVN_OPTS ? [
env.DROOLS_BUILD_MVN_OPTS ] : [])
+ .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [
env.BUILD_MVN_OPTS_CURRENT ] : [])
+ .withProperty('maven.test.failure.ignore', true)
+ .skipTests(params.SKIP_TESTS)
+
+ if (isRelease()) {
+
releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
+ mavenCommand.withProfiles(['apache-release'])
}
- withCredentials([usernamePassword(credentialsId:
env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable:
'REPOSITORY_TOKEN')]) {
- mavenCommand
- .withProperty('apache.repository.username',
"${REPOSITORY_USER}")
- .withProperty('apache.repository.password',
"${REPOSITORY_TOKEN}")
+
+ configFileProvider([configFile(fileId:
env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
+
mavenCommand.withSettingsXmlFile(MAVEN_SETTINGS_FILE).run("clean
$installOrDeploy")
}
}
- mavenCommand.run("clean $installOrDeploy")
}
}
post {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
