[I/Y/P-Build] Unify and fix artifact archiving and make it more specific

The archiving step in case of build-failures resulted in no artifacts being archived.
eclipse-platform · Jan 16, 2025 · fe31258 · fe31258
1 parent 2e78080
commit fe31258
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile
@@ -284,15 +284,10 @@ spec:
                 sh '''
                     source $CJE_ROOT/buildproperties.shsource
                     cp -r $logDir/* $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs
-                    rm -rf $logDir
                     rm -rf $CJE_ROOT/$DROP_DIR/$BUILD_ID/apitoolingreference
-                    cp $CJE_ROOT/buildproperties.txt $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.php $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.shsource $CJE_ROOT/$DROP_DIR/$BUILD_ID
+                    cp $CJE_ROOT/buildproperties.* $CJE_ROOT/$DROP_DIR/$BUILD_ID
                     cp $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildproperties.* $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
                 '''
-              archiveArtifacts '**/siteDir/**'
             }
 		}
 	  stage('Promote Eclipse platform'){
@@ -354,11 +349,13 @@ spec:
 		}
 	}
 	post {
+		always {
+			archiveArtifacts 'cje-production/siteDir/**'
+		}
 		failure {
 			emailext subject: "${RELEASE_VER} ${BUILD_TYPE}-Build: ${BUILD_IID} - BUILD FAILED",
 				body: "Please go to ${BUILD_URL}console and check the build failure.", mimeType: 'text/plain',
 				to: "${BUILD.mailingList}", from:'[email protected]'
-			archiveArtifacts "${CJE_ROOT}/siteDir/eclipse/downloads/drops4/${BUILD_IID}/gitLog.html, $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator"
 		}
 		success {
 			emailext subject: "${RELEASE_VER} ${BUILD_TYPE}-Build: ${BUILD_IID} ${COMPARATOR_ERRORS_SUBJECT}",

diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy
@@ -208,11 +208,6 @@ spec:
                 }
             }
         }
-	  stage('Archive artifacts'){
-          steps {
-              archiveArtifacts '**/siteDir/**'
-            }
-		}
 	  stage('Promote Update Site'){
           steps {
               container('jnlp') {
@@ -227,6 +222,9 @@ spec:
 		}
 	}
 	post {
+		always {
+			archiveArtifacts 'cje-production/siteDir/**'
+		}
         failure {
             emailext body: "Please go to <a href='${BUILD_URL}console'>${BUILD_URL}console</a> and check the build failure.<br><br>",
             subject: "${env.RELEASE_VER.trim()} P-Build: ${env.BUILD_IID.trim()} - BUILD FAILED",