From 170de1c9d5b45eed63dba16c4462a1a292f13116 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 4 May 2023 10:39:24 +0200
Subject: [PATCH] Correct post-release job for Stream 8 (#2812)

* Correct post-release job for Stream 8

* Update Jenkinsfile.post-release
---
 .ci/jenkins/project/Jenkinsfile.post-release | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.ci/jenkins/project/Jenkinsfile.post-release b/.ci/jenkins/project/Jenkinsfile.post-release
index 7b674b31ae..c5e4316227 100644
--- a/.ci/jenkins/project/Jenkinsfile.post-release
+++ b/.ci/jenkins/project/Jenkinsfile.post-release
@@ -55,6 +55,19 @@ pipeline {
                 }
             }
         }
+        
+        stage('Prepare for post-release') {
+            steps {
+                script {
+                    dir(optaplannerRepository) {
+                        checkoutTag(optaplannerRepository, getProjectVersion(), stableBranchName)
+                    }
+                    dir(quickstartsRepository) {
+                        checkoutTag(quickstartsRepository, getGitTag(), stableBranchName)
+                    }
+                }
+            }
+        }
 
         stage('Reset Quickstarts stable branch') {
             when {
@@ -63,7 +76,6 @@ pipeline {
             steps {
                 script {
                     dir(quickstartsRepository) {
-                        checkoutTag(quickstartsRepository, getGitTag(), stableBranchName)
                         removeJbossNexusFromMavenAndGradle()
                         commitAndForcePushBranch(quickstartsRepository, stableBranchName)
                     }
@@ -74,11 +86,7 @@ pipeline {
         stage('Upload OptaPlanner distribution from Quickstarts') {
             steps {
                 script {
-                    dir(optaplannerRepository) {
-                        checkoutTag(optaplannerRepository, getProjectVersion(), stableBranchName)
-                        getMavenCommand().withProperty('quickly').withProperty('full').run('clean install')
-                    }
-
+                    getMavenCommand().inDirectory(optaplannerRepository).withProperty('quickly').withProperty('full').run('clean install')
                     getMavenCommand().inDirectory(quickstartsRepository).skipTests(true).withProperty('full').run('clean install')
                     uploadDistribution(quickstartsRepository)
                 }
@@ -284,4 +292,4 @@ boolean isStream8() {
 
 boolean isStream9() {
     return env.OPTAPLANNER_LATEST_STREAM == '9'
-}
\ No newline at end of file
+}