Skip to content

Commit 791132e

Browse files
committed
[I/Y-Build] Use remote P2-repository as reference for generated Reports
This avoids the need to mirror the reference repository locally on each build. It leverages: - eclipse-cbi/p2repo-analyzers#60
1 parent a6a38ac commit 791132e

3 files changed

Lines changed: 3 additions & 46 deletions

File tree

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,24 +186,13 @@ pipeline {
186186
$BASE_BUILDER_ECLIPSE_EXE \
187187
-debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \
188188
-application org.eclipse.equinox.p2.director \
189-
-repository ${ECLIPSE_RUN_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/products/nightly/latest \
190-
-installIU org.eclipse.pde.api.tools,org.eclipse.cbi.p2repo.analyzers \
189+
-repository ${ECLIPSE_RUN_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/tools/nightly/latest \
190+
-installIU org.eclipse.pde.api.tools,org.eclipse.cbi.p2repo.analyzers.feature.feature.group \
191191
-profile SDKProfile
192192
'''
193193
}
194194
}
195195
}
196-
stage('Download reference repo for repo reports'){
197-
steps {
198-
dir("${CJE_ROOT}/mbscripts") {
199-
sshagent(['projects-storage.eclipse.org-bot-ssh']) {
200-
sh '''#!/bin/bash -xe
201-
./mb030_downloadBuildToCompare.sh $CJE_ROOT/buildproperties.shsource 2>&1
202-
'''
203-
}
204-
}
205-
}
206-
}
207196
stage('Aggregator maven build'){
208197
environment {
209198
KEYRING = credentials('secret-subkeys-releng.asc')
@@ -365,7 +354,7 @@ pipeline {
365354
$BASE_BUILDER_ECLIPSE_EXE \
366355
-application org.eclipse.cbi.p2repo.analyzers.repoReport \
367356
-data $CJE_ROOT/$TMP_DIR/workspace-report -vmargs -Xmx1g \
368-
-DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$BASEBUILD_ID \
357+
-DreferenceRepo=https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_REPO_ID}/${BASEBUILD_ID} \
369358
-DreportRepoDir=${PLATFORM_REPO_DIR} \
370359
-DreportOutputDir=${DROP_DIR}/${BUILD_ID}/buildlogs
371360

cje-production/buildproperties.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ STREAMMinor="40"
2424
STREAMService="0"
2525
TMP_DIR="tmp"
2626
DOWNLOAD_HOST="download.eclipse.org"
27-
BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
2827
LOCAL_REPO="localMavenRepo"
2928
NEXT_JAVA_RELEASE_DATE=""
3029

cje-production/mbscripts/mb030_downloadBuildToCompare.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)