From cd8a0000a78d4c84147a21d99bac05b015fef359 Mon Sep 17 00:00:00 2001
From: Michael Biarnes Kiefer <mbiarnes@redhat.com>
Date: Wed, 21 Dec 2022 15:37:28 +0100
Subject: [PATCH] KOGITO-8115: Deploy jobs should deploy locally and then push
 to Nexus

---
 .ci/jenkins/Jenkinsfile.deploy | 15 +--------------
 .ci/jenkins/dsl/jobs.groovy    |  6 ++++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index af6b1602e6f..cd21fa5d753 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)
@@ -225,7 +212,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) {