Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-04-05 02:30:16 -0400
committerSravan Kumar Lakkimsetti2019-04-05 02:30:53 -0400
commit28457a3db9d95f5bc4f7dd02046813512d209634 (patch)
treee2b477c6b88d0efacb8eb8228494ae0dfdb12a0c
parent3472458e3ef07d3302e03d287320a76cc1d9b8d3 (diff)
downloadeclipse.platform.releng.aggregator-28457a3db9d95f5bc4f7dd02046813512d209634.tar.gz
eclipse.platform.releng.aggregator-28457a3db9d95f5bc4f7dd02046813512d209634.tar.xz
eclipse.platform.releng.aggregator-28457a3db9d95f5bc4f7dd02046813512d209634.zip
Revert "Bug 546098 - Create new scripts to generate repository reports"
This reverts commit 3472458e3ef07d3302e03d287320a76cc1d9b8d3. Revert "Bug 546098 - Create new scripts to generate repository reports" This reverts commit 45ccf47e656fbb6834fbed4ca2933ae5f654a33b.
-rw-r--r--cje-production/buildproperties.txt1
-rwxr-xr-xcje-production/mbscripts/mb020_createBaseBuilder.sh2
-rwxr-xr-xcje-production/mbscripts/mb030_downloadBuildToCompare.sh2
-rwxr-xr-xcje-production/mbscripts/mb500_createRepoReports.sh4
4 files changed, 5 insertions, 4 deletions
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 28f243ca..5aef6b67 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -25,6 +25,7 @@ AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
AGG_DIR="gitCache/eclipse.platform.releng.aggregator"
DROP_DIR="siteDir/eclipse/downloads/drops4"
TMP_DIR="tmp"
+BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
# Base builder parameters
PREVIOUS_RELEASE_ID="R-4.11-201903070500"
diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh
index f9210d31..01612af3 100755
--- a/cje-production/mbscripts/mb020_createBaseBuilder.sh
+++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh
@@ -40,4 +40,4 @@ ${TMP}/eclipse/eclipse -nosplash \
-destination \
${qualifiedBaseBuilder} \
-profile \
- SDKProfile
+ SDKProfile &
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index 57e5ece6..fad2ec3e 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -24,5 +24,5 @@ source $1
mkdir -p $CJE_ROOT/$TMP_DIR
pushd $CJE_ROOT/$TMP_DIR
-$CJE_ROOT/$BASEBUILDER_DIR/eclipse -nosplash -application org.eclipse.equinox.p2.artifact.repository.mirrorApplication -source https://$DOWNLOAD_HOST/eclipse/updates/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID/ -destination file:$CJE_ROOT/$TMP_DIR/$PREVIOUS_RELEASE_ID/
+wget --recursive --no-parent --no-verbose http://$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID &
popd
diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh
index 84b9169f..73b19891 100755
--- a/cje-production/mbscripts/mb500_createRepoReports.sh
+++ b/cje-production/mbscripts/mb500_createRepoReports.sh
@@ -36,6 +36,6 @@ tar -xf $CJE_ROOT/$TMP_DIR/$tar_name -C $report_app_dir
mkdir -p $output_dir
$report_app_dir/p2analyze/p2analyze -data $output_dir/workspace-report -vm $JAVA_HOME/bin -vmargs -Xmx1g \
- -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$PREVIOUS_RELEASE_ID \
+ -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID \
-DreportRepoDir=$buildToTest \
- -DreportOutputDir=$output_dir
+ -DreportOutputDir=$output_dir &

Back to the top