diff options
author | kitlo | 2019-04-26 05:40:13 +0000 |
---|---|---|
committer | kitlo | 2019-04-26 05:40:13 +0000 |
commit | c0528a8fa78a70aafedd16a391b6c0748837d047 (patch) | |
tree | a93a698f7a71ebe43ed65e50eb9542ef1cc9e065 | |
parent | 93caff83fe7984a81aebd61eddc28bf30e8a91b6 (diff) | |
download | eclipse.platform.releng.aggregator-c0528a8fa78a70aafedd16a391b6c0748837d047.tar.gz eclipse.platform.releng.aggregator-c0528a8fa78a70aafedd16a391b6c0748837d047.tar.xz eclipse.platform.releng.aggregator-c0528a8fa78a70aafedd16a391b6c0748837d047.zip |
Bug 546760 - Create new scripts to gather Eclipse publish files
Change-Id: Iaa1c6354b338fcf8af6f283a7ee5614365e342ca
Signed-off-by: kitlo <kitlo@us.ibm.com>
-rw-r--r-- | cje-production/buildproperties.txt | 23 | ||||
-rwxr-xr-x | cje-production/master-build.sh | 7 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb010_createEnvfiles.sh | 35 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb020_createBaseBuilder.sh | 26 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb030_downloadBuildToCompare.sh | 1 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb300_gatherEclipseParts.sh | 118 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb310_gatherEquinoxParts.sh | 22 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb500_createRepoReports.sh | 13 | ||||
-rwxr-xr-x | cje-production/mbscripts/mb510_createApiToolsReports.sh | 9 | ||||
-rwxr-xr-x | cje-production/scripts/common-functions.shsource | 24 |
10 files changed, 169 insertions, 109 deletions
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 0a1260fca..e4ccce44d 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -19,8 +19,12 @@ BRANCH="master" PATCH_OR_BRANCH_LABEL="master" BUILD_TYPE="I" +TESTED_BUILD_TYPE="I" RELEASE_VER="4.12" STREAM="4.12.0" +STREAMMajor="4" +STREAMMinor="12" +STREAMService="0" GIT_ROOT="git://git.eclipse.org/gitroot" AGG_REPO="/platform/eclipse.platform.releng.aggregator.git" AGG_DIR="gitCache/eclipse.platform.releng.aggregator" @@ -30,6 +34,7 @@ EQUINOX_DROP_DIR="siteDir/equinox/drops" TMP_DIR="tmp" DOWNLOAD_HOST="download.eclipse.org" BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates" +LOCAL_REPO="localMavenRepo" # Base builder parameters PREVIOUS_RELEASE_ID="R-4.11-201903070500" @@ -39,21 +44,3 @@ WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3 WEBTOOLS_VER="1.2.0.v201405010053" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.12-I-builds/" - -# Old build variables, need to clean up -GIT_ACCESS="ssh://genie.releng@git.eclipse.org:29418" -aggDir="gitCache/eclipse.platform.releng.aggregator" -REPO_AND_ACCESS="ssh://genie.releng@git.eclipse.org:29418" -AGGREGATOR_REPO="ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git" -MAVEN_OPTS="-Xms2048m -Xmx5120m -Djava.io.tmpdir=/shared/eclipse/builds/4I/tmp -Dtycho.localArtifacts=ignore " -B_GIT_EMAIL="genie.releng@eclipse.org" -B_GIT_NAME="Releng HIPP" -COMMITTER_ID="genie.releng" -MVN_DEBUG="false" -MVN_QUIET="false" -SIGNING="true" -MAVEN_BREE="-Pbree-libs" -LOCAL_REPO="localMavenRepo" -JAVA_DOC_TOOL="-Declipse.javadoc=/shared/common/java/openjdk/jdk-11_x64-latest/bin/javadoc" -MAVEN_SETTINGS="--settings /shared/eclipse/settings/settingsBuildMachine.xml" -ARCHIVE_HOST="archive.eclipse.org" diff --git a/cje-production/master-build.sh b/cje-production/master-build.sh index 1b4e8595d..3344a469b 100755 --- a/cje-production/master-build.sh +++ b/cje-production/master-build.sh @@ -18,7 +18,7 @@ source $CJE_ROOT/scripts/common-functions.shsource chmod +x mbscripts/* -logDir=$CJE_ROOT/$TMP_DIR/buildlogs +logDir=$CJE_ROOT/buildlogs mkdir -p $logDir pushd mbscripts @@ -31,10 +31,9 @@ popd wait source $CJE_ROOT/buildproperties.shsource - -cp -r $logDir/* $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs/. +cp -r $logDir/* $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs +rm -rf $logDir cp $CJE_ROOT/buildproperties.txt $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.php $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.shsource $CJE_ROOT/$DROP_DIR/$BUILD_ID -rm -rf $CJE_ROOT/$TMP_DIR diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh index 357bdc517..f4c151f54 100755 --- a/cje-production/mbscripts/mb010_createEnvfiles.sh +++ b/cje-production/mbscripts/mb010_createEnvfiles.sh @@ -33,9 +33,9 @@ BUILD_ENV_FILE_PROP=$CJE_ROOT/${propEnvFile} fn-addToPropFiles () { - echo "export $1=$2" >> $BUILD_ENV_FILE - echo "\$$1 = $2;" >> $BUILD_ENV_FILE_PHP - echo "$1 = $2" >> $BUILD_ENV_FILE_PROP + echo "export $1=$2" >> $BUILD_ENV_FILE + echo "\$$1 = $2;" >> $BUILD_ENV_FILE_PHP + echo "$1 = $2" >> $BUILD_ENV_FILE_PROP } echo "#!/bin/bash" >> $BUILD_ENV_FILE @@ -50,19 +50,24 @@ fn-addToPropFiles TIMESTAMP "\"$(date +%Y%m%d-%H%M --date='@'$RAWDATE_TRUNC)\"" while read propLine do - if [[ ${propLine:0:1} == "#" ]] - then - continue - else - key=$(echo $propLine|cut -d= -f1) - value=$(echo $propLine|cut -d= -f2-) - if [[ -z $key ]] - then - continue - fi - fn-addToPropFiles $key "$value" - fi + if [[ ${propLine:0:1} == "#" ]]; then + continue + else + key=$(echo $propLine|cut -d= -f1) + value=$(echo $propLine|cut -d= -f2-) + if [[ -z $key ]]; then + continue + fi + fn-addToPropFiles $key "$value" + fi done < ../buildproperties.txt source $BUILD_ENV_FILE +# add BUILD_ENV_FILE* variables to prop files before using fn-write-property in common-functions.shsource +fn-addToPropFiles BUILD_ENV_FILE "\"$BUILD_ENV_FILE\"" +fn-addToPropFiles BUILD_ENV_FILE_PHP "\"$BUILD_ENV_FILE_PHP\"" +fn-addToPropFiles BUILD_ENV_FILE_PROP "\"$BUILD_ENV_FILE_PROP\"" +# variables in buildproperties.txt are now defined, add other commonly used variables to prop files fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\"" +fn-addToPropFiles ECLIPSE_BUILDER_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder\"" +fn-addToPropFiles PLATFORM_REPO_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository\"" diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh index 01612af3b..096e5b9d3 100755 --- a/cje-production/mbscripts/mb020_createBaseBuilder.sh +++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh @@ -22,22 +22,18 @@ fi source $CJE_ROOT/scripts/common-functions.shsource source $1 -qualifiedBaseBuilder="$CJE_ROOT/$BASEBUILDER_DIR" -TMP="$CJE_ROOT/$BASEBUILDER_DIR/tmp" -mkdir -p $TMP -pushd $TMP +mkdir -p $CJE_ROOT/$TMP_DIR +pushd $CJE_ROOT/$TMP_DIR wget -O eclipsePlatform.tar.gz https://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-platform-${PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz tar zxf eclipsePlatform.tar.gz popd -${TMP}/eclipse/eclipse -nosplash \ - -debug -consolelog -data ${TMP}/workspace-toolsinstall \ - -application org.eclipse.equinox.p2.director \ - -repository \ - ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},${WEBTOOLS_REPO} \ - -installIU \ - org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group/${WEBTOOLS_VER},org.apache.derby.core.feature.feature.group \ - -destination \ - ${qualifiedBaseBuilder} \ - -profile \ - SDKProfile & +$CJE_ROOT/$TMP_DIR/eclipse/eclipse -nosplash \ + -debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \ + -application org.eclipse.equinox.p2.director \ + -repository ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},${WEBTOOLS_REPO} \ + -installIU org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group/${WEBTOOLS_VER},org.apache.derby.core.feature.feature.group \ + -destination $CJE_ROOT/$BASEBUILDER_DIR \ + -profile SDKProfile + +fn-write-property LAUNCHER_JAR \"$(find $CJE_ROOT/$BASEBUILDER_DIR -name org.eclipse.equinox.launcher_*.jar | tail -1)\" diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh index fad2ec3eb..b2a9e4b6d 100755 --- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh +++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh @@ -22,7 +22,6 @@ fi source $CJE_ROOT/scripts/common-functions.shsource source $1 -mkdir -p $CJE_ROOT/$TMP_DIR pushd $CJE_ROOT/$TMP_DIR wget --recursive --no-parent --no-verbose http://$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID & popd diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh index c1aefd7b8..818efce97 100755 --- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh +++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh @@ -22,27 +22,31 @@ fi source $CJE_ROOT/scripts/common-functions.shsource source $1 -mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID/repository +mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID +mkdir -p $CJE_ROOT/$UPDATES_DIR/$BUILD_ID mkdir -p $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID +# gather maven properties +cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties + # gather repo echo $PATCH_BUILD if [ -z $PATCH_BUILD ]; then - REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository + REPO_DIR=$PLATFORM_REPO_DIR else PATCH_BUILD_GENERIC=java12patch - REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository + REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository fi if [ -d $REPO_DIR ]; then pushd $REPO_DIR - cp -r * $CJE_ROOT/$DROP_DIR/$BUILD_ID/repository + cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID popd fi if [ -z $PATCH_BUILD ]; then # gather sdk - TARGET_PRODUCTS_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products + TARGET_PRODUCTS_DIR=$ECLIPSE_BUILDER_DIR/sdk/target/products if [ -d $TARGET_PRODUCTS_DIR ]; then pushd $TARGET_PRODUCTS_DIR cp org.eclipse.sdk.ide-linux.gtk.ppc64le.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-linux-gtk-ppc64le.tar.gz @@ -54,7 +58,7 @@ if [ -z $PATCH_BUILD ]; then fi # gather platform - TARGET_PRODUCTS_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products + TARGET_PRODUCTS_DIR=$ECLIPSE_BUILDER_DIR/platform/target/products if [ -d $TARGET_PRODUCTS_DIR ]; then pushd $TARGET_PRODUCTS_DIR cp org.eclipse.platform.ide-linux.gtk.ppc64le.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-linux-gtk-ppc64le.tar.gz @@ -82,7 +86,7 @@ if [ -z $PATCH_BUILD ]; then fi # gather test zips - TEST_ZIP_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target + TEST_ZIP_DIR=$ECLIPSE_BUILDER_DIR/eclipse-junit-tests/target if [ -d $TEST_ZIP_DIR ]; then pushd $TEST_ZIP_DIR cp eclipse-junit-tests-bundle.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-Automated-Tests-$BUILD_ID.zip @@ -98,16 +102,14 @@ if [ -z $PATCH_BUILD ]; then fi # slice repos - LAUNCHER_JAR=$(find $CJE_ROOT/$BASEBUILDER_DIR -name org.eclipse.equinox.launcher_*.jar | tail -1) - ANT_SCRIPT=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml - PLATFORM_REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository + ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/repos/buildAll.xml if [ -d $PLATFORM_REPO_DIR ]; then pushd $PLATFORM_REPO_DIR java -jar $LAUNCHER_JAR \ -application org.eclipse.ant.core.antRunner \ -buildfile $ANT_SCRIPT \ - -data $CJE_ROOT/$DROP_DIR/$BUILD_ID/workspace-buildrepos \ - -Declipse.build.configs=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder \ + -data $CJE_ROOT/$TMP_DIR/workspace-buildrepos \ + -Declipse.build.configs=$ECLIPSE_BUILDER_DIR \ -DbuildId=$BUILD_ID \ -DbuildLabel=$BUILD_ID \ -DbuildRepo=$PLATFORM_REPO_DIR \ @@ -146,3 +148,95 @@ if [ -d $CJE_ROOT/$AGG_DIR ]; then find . -regex .*target/artifactcomparison -type d -exec zip -r $comparatorlogsDir/artifactcomparisons.zip '{}' \; popd fi + +# verify comparatorlogs +# +# Note: copy mb220_buildSdkPatch.sh.log as mb060_run-maven-build_output.txt for now to avoid changing eclipse_compare.xml +# To-do: modify eclipse_compare.xml to use mb220_buildSdkPatch.sh.log after CJE migration +cp $CJE_ROOT/buildlogs/mb220_buildSdkPatch.sh.log $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs/mb060_run-maven-build_output.txt +# +pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID +ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/buildScripts/eclipse_compare.xml +java -jar $LAUNCHER_JAR \ + -application org.eclipse.ant.core.antRunner \ + -buildfile $ANT_SCRIPT \ + -data $CJE_ROOT/$TMP_DIR/workspace-comparatorLogs \ + -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ + -DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ + -DbuildId=$BUILD_ID \ + -DbuildLabel=$BUILD_ID \ + -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ + -v \ + compare +popd + +# gather compilelogs +if [ -d $CJE_ROOT/$AGG_DIR ]; then + pushd $CJE_ROOT/$AGG_DIR + compilelogsDir=$CJE_ROOT/$DROP_DIR/$BUILD_ID/compilelogs/plugins + for log in $( find $CJE_ROOT/$AGG_DIR -name "compilelogs" -type d ); do + targetDir=$( dirname $log ) + if [ ! -r $targetDir/MANIFEST.MF ]; then + echo "** Failed to process $log in $targetDir. Likely compile error. Will backup to source MANIFEST.MF in directory containing target." + targetDir=$( dirname $targetDir ) + if [ ! -r $targetDir/META-INF/MANIFEST.MF ]; then + echo "**Failed to process $log in $targetDir." + else + bundleId=$( grep Bundle-SymbolicName $targetDir/META-INF/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) + bundleVersion=$( grep Bundle-Version $targetDir/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) + mkdir -p $compilelogsDir/${bundleId}_${bundleVersion} + rsync -vr $log/ $compilelogsDir/${bundleId}_${bundleVersion}/ + fi + else + bundleId=$( grep Bundle-SymbolicName $targetDir/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) + bundleVersion=$( grep Bundle-Version $targetDir/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) + mkdir -p $compilelogsDir/${bundleId}_${bundleVersion} + rsync -vr $log/ $compilelogsDir/${bundleId}_${bundleVersion}/ + fi + done + popd +fi + +# verify compilelog +pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID +ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/helper.xml +java -jar $LAUNCHER_JAR \ + -application org.eclipse.ant.core.antRunner \ + -buildfile $ANT_SCRIPT \ + -data $CJE_ROOT/$TMP_DIR/workspace-verifyCompile \ + -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ + -DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ + -DbuildId=$BUILD_ID \ + -DbuildLabel=$BUILD_ID \ + -DpostingDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ + -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ + -v \ + verifyCompile +popd + +# publish Eclipse +pushd $CJE_ROOT +ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/helper.xml +java -jar $LAUNCHER_JAR \ + -application org.eclipse.ant.core.antRunner \ + -buildfile $ANT_SCRIPT \ + -data $CJE_ROOT/$TMP_DIR/workspace-publish \ + -DAGGR_DIR=$CJE_ROOT/$AGG_DIR \ + -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ + -DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ + -DbuildId=$BUILD_ID \ + -DbuildLabel=$BUILD_ID \ + -DbuildDir=$BUILD_ID \ + -DbuildRepo=$PLATFORM_REPO_DIR \ + -DbuildType=$BUILD_TYPE \ + -DpostingDirectory=$CJE_ROOT/$DROP_DIR \ + -DequinoxPostingDirectory=$BUILD_ROOT/$EQUINOX_DROP_DIR \ + -DpublishingContent=$ECLIPSE_BUILDER_DIR/eclipse/publishingFiles \ + -DdropTemplateFileName=$ECLIPSE_BUILDER_DIR/eclipse/publishingFiles/templateFiles/index.template_$PATCH_OR_BRANCH_LABEL.php \ + -DindexFileName=index.php \ + -DeclipseStream=$STREAM \ + -Dbase.builder=$CJE_ROOT/$BASEBUILDER_DIR \ + -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ + -v \ + publish +popd diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh index cdfe3f8d2..3fbfbebb3 100755 --- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh +++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh @@ -23,7 +23,7 @@ source $CJE_ROOT/scripts/common-functions.shsource source $1 # gather Equinox Starter Kit -REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/target/products +REPO_DIR=$ECLIPSE_BUILDER_DIR/equinox.starterkit.product/target/products if [ -d $REPO_DIR ]; then pushd $REPO_DIR @@ -36,7 +36,7 @@ if [ -d $REPO_DIR ]; then fi # gather Equinox SDK -REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/target +REPO_DIR=$ECLIPSE_BUILDER_DIR/equinox-sdk/target if [ -d $REPO_DIR ]; then pushd $REPO_DIR @@ -51,27 +51,25 @@ fi # publish Equinox pushd $CJE_ROOT -mkdir -p $CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox/$TMP_DIR -REPO_DIR=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository -LAUNCHER_JAR=$(find $CJE_ROOT/$BASEBUILDER_DIR -name org.eclipse.equinox.launcher_*.jar | tail -1) -ANT_SCRIPT=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml +mkdir -p $ECLIPSE_BUILDER_DIR/equinox/$TMP_DIR +ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/equinox/helper.xml java -jar $LAUNCHER_JAR \ -application org.eclipse.ant.core.antRunner \ -buildfile $ANT_SCRIPT \ - -data $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/workspace-publishEquinox \ - -DEBuilderDir=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder \ + -data $CJE_ROOT/$TMP_DIR/workspace-publishEquinox \ + -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ -DbuildDir=$BUILD_ID \ -DbuildDirectory=$CJE_ROOT/$EQUINOX_DROP_DIR \ -DbuildId=$BUILD_ID \ - -DbuildRepo=$REPO_DIR \ + -DbuildRepo=$PLATFORM_REPO_DIR \ -DbuildType=$BUILD_TYPE \ -DpostingDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ -DequinoxPostingDirectory=$CJE_ROOT/$EQUINOX_DROP_DIR \ - -DeqpublishingContent=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles \ - -DdropTemplateFileName=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_$PATCH_OR_BRANCH_LABEL.php \ + -DeqpublishingContent=$ECLIPSE_BUILDER_DIR/equinox/publishingFiles \ + -DdropTemplateFileName=$ECLIPSE_BUILDER_DIR/eclipse/publishingFiles/templateFiles/index.template_$PATCH_OR_BRANCH_LABEL.php \ -DindexFileName=index.php \ -DeclipseStream=$STREAM \ - -Dequinox.build.configs=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs \ + -Dequinox.build.configs=$ECLIPSE_BUILDER_DIR/equinox/buildConfigs \ -Dbase.builder=$CJE_ROOT/$BASEBUILDER_DIR \ -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ -v \ diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh index 73b19891a..accd85d45 100755 --- a/cje-production/mbscripts/mb500_createRepoReports.sh +++ b/cje-production/mbscripts/mb500_createRepoReports.sh @@ -24,18 +24,17 @@ wait source $CJE_ROOT/scripts/common-functions.shsource source $1 -buildToTest=$CJE_ROOT/$DROP_DIR/$BUILD_ID/repository +buildToTest=$CJE_ROOT/$UPDATES_DIR/$BUILD_ID output_dir=$CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz -report_app_dir=$CJE_ROOT/$DROP_DIR/$BUILD_ID/reportApplication +report_app_dir=$CJE_ROOT/$TMP_DIR/reportApplication wget --no-proxy --no-verbose --no-cache -O $CJE_ROOT/$TMP_DIR/$tar_name https://ci.eclipse.org/cbi/job/cbi.p2repo.analyzers_cleanAndDeploy/lastSuccessfulBuild/artifact/output/products/$tar_name mkdir -p $report_app_dir 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/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID \ - -DreportRepoDir=$buildToTest \ - -DreportOutputDir=$output_dir & +$report_app_dir/p2analyze/p2analyze -data $CJE_ROOT/$TMP_DIR/workspace-report -vm $JAVA_HOME/bin -vmargs -Xmx1g \ + -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID \ + -DreportRepoDir=$buildToTest \ + -DreportOutputDir=$output_dir diff --git a/cje-production/mbscripts/mb510_createApiToolsReports.sh b/cje-production/mbscripts/mb510_createApiToolsReports.sh index db8aafcdf..af7890262 100755 --- a/cje-production/mbscripts/mb510_createApiToolsReports.sh +++ b/cje-production/mbscripts/mb510_createApiToolsReports.sh @@ -22,8 +22,7 @@ fi source $CJE_ROOT/scripts/common-functions.shsource source $1 -LAUNCHER_JAR=$(find $CJE_ROOT/$BASEBUILDER_DIR -name org.eclipse.equinox.launcher_*.jar | tail -1) -ANT_SCRIPT=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml +ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/buildScripts/api-tools-builder.xml # Change to appropriate versions and uncomment when entering API freeze #FREEZE_PARAMS="-DfreezeBaseURL=https://$DOWNLOAD_HOST/eclipse/downloads/drops4/S-4.12RC1-yyyymmddhhmm/eclipse-SDK-4.12RC1-win32-x86_64.zip -DfreezeName=Eclipse-SDK-4.12RC1 -DfreezeFilename=eclipse-SDK-4.12RC1-win32-x86_64.zip" @@ -31,12 +30,11 @@ ANT_SCRIPT=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclips FREEZE_PARAMS=" " pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID - java -jar $LAUNCHER_JAR \ -application org.eclipse.ant.core.antRunner \ -buildfile $ANT_SCRIPT \ - -data $CJE_ROOT/$DROP_DIR/$BUILD_ID/workspace-apitoolingsLogs \ - -DEBuilderDir=$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder \ + -data $CJE_ROOT/$TMP_DIR/workspace-apitoolingsLogs \ + -DEBuilderDir=$ECLIPSE_BUILDER_DIR \ -DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \ -DbuildId=$BUILD_ID \ -DbuildLabel=$BUILD_ID \ @@ -47,5 +45,4 @@ java -jar $LAUNCHER_JAR \ -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \ $FREEZE_PARAMS \ apiToolsReports - popd diff --git a/cje-production/scripts/common-functions.shsource b/cje-production/scripts/common-functions.shsource index 7207e4b87..36cfc8bd0 100755 --- a/cje-production/scripts/common-functions.shsource +++ b/cje-production/scripts/common-functions.shsource @@ -27,22 +27,9 @@ fn-write-property () { - checkNArgs $# 1 - if [[ $? != 0 ]]; then return 1; fi - VAR_NAME=$1 - if [[ -z "${VAR_NAME}" ]] - then - echo "VAR_NAME must be passed to this script, $0." - return 1 - fi - - # bash scripts (export may be overkill ... but, just in case needed) - echo "export ${VAR_NAME}=\"${!VAR_NAME//\"/\\\"}\"" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include" - echo "\$${VAR_NAME} = \"${!VAR_NAME//\"/\\\"}\";" >> $BUILD_ENV_FILE_PHP - # standard properties file - echo "${VAR_NAME} = \"${!VAR_NAME//\"/\\\"}\"" >> $BUILD_ENV_FILE_PROP - + echo "export $1=$2" >> $BUILD_ENV_FILE + echo "\$$1 = $2;" >> $BUILD_ENV_FILE_PHP + echo "$1 = $2" >> $BUILD_ENV_FILE_PROP } # this function executes command passed as command line parameter and @@ -51,9 +38,8 @@ fn-run-command () { $* returnCode=$? - if [ $returnCode != 0 ] - then + if [ $returnCode != 0 ]; then echo "Execution of \"$*\" failed with return code : $returnCode" exit $returnCode fi -}
\ No newline at end of file +} |