Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2016-04-13 19:03:34 -0400
committerDavid Williams2016-04-13 19:03:34 -0400
commit133d6f3cdf87377410cb561d6c5e29c2997c2b14 (patch)
treecbeca5319a28344176015de705d51df17538d78b
parentdbfa0bd963583dc25d07371496b80abd9a046b50 (diff)
downloadeclipse.platform.releng.aggregator-133d6f3cdf87377410cb561d6c5e29c2997c2b14.tar.gz
eclipse.platform.releng.aggregator-133d6f3cdf87377410cb561d6c5e29c2997c2b14.tar.xz
eclipse.platform.releng.aggregator-133d6f3cdf87377410cb561d6c5e29c2997c2b14.zip
bug 436300 Initial work to restore buildnotes function.
plus collection of artifactcomparisons
-rwxr-xr-xproduction/build-functions.shsource49
-rwxr-xr-xproduction/gather-parts.sh3
-rwxr-xr-xproduction/sdk/promotion/syncDropLocation.sh23
3 files changed, 54 insertions, 21 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 9d88715f..2dc2744b 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -967,8 +967,55 @@ fn-gather-23-compile-logs ()
echo "[ERROR] $REPO_DIR did not exist in fn-gather-23-compile-logs"
fi
}
+# fn-gather-buildnotes
+# BUILD_ID: I20121116-0700
+# REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
+# BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
+function fn-gather-buildnotes
+{
+ checkNArgs $# 3
+ if [[ $? != 0 ]]; then return 1; fi
+ BUILD_ID="$1"; shift
+ REPO_DIR="$1"; shift
+ BUILD_DIR="$1"; shift
+ echo "collecting buildnotes"
+ if [[ -d "$REPO_DIR" ]]
+ then
+ pushd "$REPO_DIR"
+ mkdir -p "${BUILD_DIR}/holdBuildNotes"
+ find . -name "buildnotes_*.html" -exec rsync '{}' "${BUILD_DIR}/holdBuildNotes/" \;
+ popd
+ else
+ echo " ERROR: $REPO_DIR did not exist in fn-gather-buildnotes"
+ return 1
+ fi
+}
+# fn-gather-artifactcomparisons
+# BUILD_ID: I20121116-0700
+# REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
+# BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
+function fn-gather-artifactcomparisons
+{
+ checkNArgs $# 3
+ if [[ $? != 0 ]]; then return 1; fi
+ BUILD_ID="$1"; shift
+ REPO_DIR="$1"; shift
+ BUILD_DIR="$1"; shift
+ echo "collecting artifactcomparisons"
+ if [[ -d "$REPO_DIR" ]]
+ then
+ pushd "$REPO_DIR"
+ mkdir -p "${BUILD_DIR}/buildlogs/comparatorlogs"
+ find . -regex ".*target/artifactcomparison" -type d -exec zip -r "${BUILD_DIR}/buildlogs/comparatorlogs/artifactcomparisons.zip" '{}' \;
+ popd
+ else
+ echo " ERROR: $REPO_DIR did not exist in fn-gather-artifactcomparisons"
+ return 1
+ fi
+}
-
+
+}
# USAGE: fn-gather-main-index BUILD_ID REPO_DIR BUILD_DIR STREAM BUILD_TYPE BUILD_PRETTY_DATE
# BUILD_ID: I20121116-0700
# REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
diff --git a/production/gather-parts.sh b/production/gather-parts.sh
index 5d4f8899..d0003d27 100755
--- a/production/gather-parts.sh
+++ b/production/gather-parts.sh
@@ -53,7 +53,8 @@ fi
# but we do (always) need these two, at least for JDT patch build
fn-gather-repo "$BUILD_ID" "$aggDir" "$buildDirectory"
fn-gather-ecj-jars "$BUILD_ID" "$aggDir" "$buildDirectory"
-
+fn-gather-buildnotes "$BUILD_ID" "$aggDir" "$buildDirectory"
+fn-gather-artifactcomparisons "$BUILD_ID" "$aggDir" "$buildDirectory"
# if doing PATCH_BUILD we do not need to slice repos
if [[ -z "${PATCH_BUILD}" ]]
then
diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh
index e229544b..9eb2bfd4 100755
--- a/production/sdk/promotion/syncDropLocation.sh
+++ b/production/sdk/promotion/syncDropLocation.sh
@@ -122,31 +122,16 @@ function sendPromoteMail ()
link=$(linkURL ${downloadURL}testResults.php)
message1="${message1}<p>&nbsp;&nbsp;&nbsp;Build logs and/or test results (eventually): <br />\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${link}</p>\n"
- BUILD_ROOT=${BUILD_HOME}/${eclipseStreamMajor}${buildType}
eclipsebuilder=eclipse.platform.releng.aggregator/production/testScripts
- dlFromPath=$( dlFromPath $eclipseStream $buildId )
- echo "DEBUG CBI dlFromPath: ${dlFromPath}"
- buildDropDir="${BUILD_ROOT}/siteDir/${dlFromPath}/${buildId}"
+
echo "DEBGUG CBI buildDropDir: ${buildDropDir}"
- builderDropLogsDir="${buildDropDir}/${comparatorLogRelPath}"
echo "DEBUG: CBI builderDropLogsDir: ${builderDropLogsDir}"
- aggr="${BUILD_ROOT}/gitcache/eclipse.platform.releng.aggregator"
-
-# another thing we need to capture from "build area", besides the artifactcomparison directories below,
-# is the buildnotes_*.html files.
-# TODO: all this "gathering" of stuff needs to move to the "gather" function, instead of
-# here in "syncDropLocation"!
- mkdir -p "${buildDropDir}/holdBuildNotes"
- find $aggr -name "buildnotes_*.html" -exec rsync '{}' "${buildDropDir}/holdBuildNotes" \;
if [[ $logSize -gt ${comparatorLogMinimumSize} ]]
then
- link=$(linkURL ${downloadURL}${comparatorLogRelPath})
- message1="${message1}<p>&nbsp;&nbsp;&nbsp;Check unanticipated comparator messages: <br />\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${link}<p>\n"
- # Plus, also zip up any artifactcomparison directories that exist in the target
- # directories.
- find $aggr -regex ".*target/artifactcomparison" -type d -exec zip -r ${builderDropLogsDir}/artifactcomparisons.zip '{}' \;
-
+ link=$(linkURL ${downloadURL}${comparatorLogRelPath})
+ echo -e "DEBUG: found logsize greater an minimum. preparing message using ${link}"
+ message1="${message1}<p>&nbsp;&nbsp;&nbsp;Check unanticipated comparator messages: <br />\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${link}<p>\n"
else
echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
fi

Back to the top