diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 2a44aa90b4d..28a80019059 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -112,20 +112,7 @@ pipeline { } } } - stage('Deploy to repository') { - when { - expression { return !shouldStageArtifacts() && shouldDeployToRepository() } - } - steps { - script { - runMavenDeploy() - } - } - } stage('Deploy locally') { - when { - expression { return shouldStageArtifacts() } - } steps { script { runMavenDeploy(true) @@ -221,7 +208,7 @@ void sendNotification() { } boolean shouldStageArtifacts() { - return isRelease() && !env.MAVEN_DEPLOY_REPOSITORY + return isRelease() } boolean shouldDeployToRepository() { diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index df99a480baf..cabb8fb2d33 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -284,10 +284,12 @@ void setupDeployJob(JobType jobType) { AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}", GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}", + MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}", MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", - MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}", - + MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_URL}", + MAVEN_REPO_CREDS_ID: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_CREDS_ID}", + DROOLS_STREAM: getDroolsStream(), ]) if (jobType == JobType.RELEASE) {