[I/Y-Build] Inline mb220_buildSdkPatch.sh script into pipeline

Author: HannesWell

JenkinsJobs/Builds/build.jenkinsfile

@@ -193,17 +193,40 @@ pipeline {
 				}
 			}
 		}
-	  stage('Aggregator maven build'){
-	      environment {
-                KEYRING = credentials('secret-subkeys-releng.asc')
-                MAVEN_GPG_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
-          }
-          steps {
-				dir("${CJE_ROOT}/mbscripts") {
-                    sh '''
-                        set -eo pipefail
-                        ./mb220_buildSdkPatch.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb220_buildSdkPatch.sh.log
-                    '''
+		stage('Aggregator maven build'){
+			environment {
+				KEYRING = credentials('secret-subkeys-releng.asc')
+				MAVEN_GPG_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
+			}
+			steps {
+				dir("${AGG_DIR}") {
+					sh '''#!/bin/bash -xe
+						set -o pipefail
+						source $CJE_ROOT/buildproperties.shsource
+						
+						mkdir -p $CJE_ROOT/$TMP_DIR
+						
+						mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch \
+							-DlocalEcjVersion=99.99 \
+							-Dmaven.repo.local=$LOCAL_REPO -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
+						
+						mvn clean verify -DskipTests=true -Pbree-libs -Peclipse-sign \
+							-Dtycho.debug.artifactcomparator \
+							-Dtycho.localArtifacts=ignore \
+							-Dcbi.jarsigner.continueOnFail=true \
+							-Dtycho.pgp.signer=bc -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" \
+							-Djgit.dirtyWorkingTree=error \
+							-Dmaven.repo.local=$LOCAL_REPO \
+							-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
+							-DbuildTimestamp=$TIMESTAMP \
+							-DbuildType=$BUILD_TYPE \
+							-DbuildId=$BUILD_ID \
+							-Dcbi-ecj-version=99.99 \
+							-e \
+							-T 1C \
+							2>&1 | tee $logDir/mb220_buildSdkPatch.sh.log
+						# The last line captures the build log to subsequently scan it for comparator errors
+					'''
 				}
 			}
 		}

cje-production/mbscripts/mb220_buildSdkPatch.sh

@@ -3,10 +3,6 @@ This is the location where we will develop production scripts for use on Cloudbe
 Here are some ground rules
 1. Each script starts with mb<xxx>_<scriptname>.sh. xxx is a 3 digit number
 	000-099 - preparing build environment like setting environment variables etc.
-	200-299 - Maven operations(Updating pom with versions from manifest, create tar ball, build SDK/patch etc)
-	300-399 - gather parts (collecting different artifacts into a temporary build location)
-	500-599 - Generate build reports (running p2.repo.analyzers and dirt report, jdeps reports etc)
-	600-699 - promote the build to download.eclipse.org.
 
 2. Every script should accept $ENV_FILE. this envrironment file is created at the preparing the build environment stage.
 3. Every script should source "common-functions.shsource". This will contain common methods used across the scripts