update with working archive and test result publishing, and nearly complete P2 publishing
diff --git a/publish.sh b/publish.sh
index b34079b..feff0b2 100644
--- a/publish.sh
+++ b/publish.sh
@@ -23,18 +23,19 @@
#Directories
ANT_HOME=/shared/common/apache-ant-1.7.0
HOME_DIR=/shared/rt/eclipselink
+DNLD_DIR=/home/data/httpd/download.eclipse.org/rt/eclipselink
JAVA_HOME=/shared/common/jdk-1.6.x86_64
LOG_DIR=${HOME_DIR}/logs
#Files
-ant.buildfile=
+ANT_BLDFILE=publishbuild.xml
# Need to export after parsing:
# BLD_DEPS_DIR
-BRANCH
-GITHASH
-BLDDATE
-handoff
+# BRANCH
+# GITHASH
+# BLDDATE
+# handoff
PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/bin:/usr/local/bin:${PATH}
@@ -43,40 +44,374 @@
#==========================
# Functions Definitions
#
+unset createPath
+createPath() {
+ # Usage: createPath path
+ path=$1
+
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "createPath: Attempting to create '${path}' path."
+ fi
+ newdir=
+ for directory in `echo ${path} | tr '/' ' '`
+ do
+ newdir=${newdir}/${directory}
+ if [ ! -d "${newdir}" ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "createPath: Creating subdir: '${newdir}'"
+ fi
+ mkdir ${newdir}
+ if [ $? -ne 0 ]
+ then
+ echo " Error (createPath): Creation of ${newdir} failed!"
+ exit
+ fi
+ fi
+ done
+}
+
unset parseHandoff
parseHandoff() {
+ # Usage: parseHandoff handoff_file
handoff_file=$1
- handoff_error_string="Error: Invalid handoff_filename: '${handoff_file}'! Should be 'handoff-file-<PROC>-<BRANCH>-<QUALIFIER>.dat'"
- handoff_content_error="Error: Invalid handoff_file contents: '`cat ${handoff_file}`'! Should be 'extract.loc=<BUILD_ARCHIVE_LOC> host=<HOST>'"
+ handoff_error_string1="Error: Invalid handoff_file name: '${handoff_file}'"
+ handoff_error_string2=" Was expecting: 'handoff-file-<PROC>-<BRANCH>-<QUALIFIER>.dat'"
+ handoff_content_error1="Error: Invalid handoff_file contents: '`cat ${handoff_file}`'"
+ handoff_content_error2=" Was expecting: 'extract.loc=<BUILD_ARCHIVE_LOC> host=<HOST> maven.tag=<VERSION>-<MILESTONE>' "
- ## Parse handoff_file for BRANCH, QUALIFIER, and HOST
+ ## Parse handoff_file name for BRANCH, QUALIFIER, and PROC (Procedure: Build/Test)
BRANCH=`echo ${handoff_file} | cut -s -d'-' -f4`
if [ "${BRANCH}" = "" ] ; then
- echo "BRANCH ${handoff_error_string}"
- exit 2
+ echo "BRANCH ${handoff_error_string1}"
+ echo " ${handoff_error_string2}"
+ BRANCH_ERR=true
+ else
+ BRANCH_ERR=false
fi
QUALIFIER=`echo ${handoff_file} | cut -s -d'-' -f5,6 | cut -d'.' -f1`
if [ "${QUALIFIER}" = "" ] ; then
- echo "QUALIFIER ${handoff_error_string}"
- exit 2
+ echo "QUALIFIER ${handoff_error_string1}"
+ echo " ${handoff_error_string2}"
+ QUALIFIER_ERR=true
+ else
+ QUALIFIER_ERR=false
fi
PROC=`echo ${handoff_file} | cut -s -d'-' -f3`
if [ ! \( \( "${PROC}" = "test" \) -o \( "${PROC}" = "build" \) \) ] ; then
- echo "PROC ${handoff_error_string}"
- exit 2
+ echo "PROC ${handoff_error_string1}"
+ echo " ${handoff_error_string2}"
+ PROC_ERR=true
+ else
+ PROC_ERR=false
fi
+ ## Parse $QUALIFIER for build date value
+ BLDDATE=`echo ${QUALIFIER} | cut -s -d'-' -f1 | cut -s -dv -f2`
+ if [ "${BLDDATE}" = "" ] ; then
+ echo "BLDDATE Error: There is something wrong with QUALIFIER. ('$QUALIFIER' should be vDATE-rREV)!"
+ BLDDATE_ERR=true
+ else
+ BLDDATE_ERR=false
+ fi
+ ## Parse $QUALIFIER for Git Hash value
+ GITHASH=`echo ${QUALIFIER} | cut -s -d'-' -f2`
+ if [ "${GITHASH}" = "" ] ; then
+ echo "GITHASH Error: There is something wrong with QUALIFIER. ('$QUALIFIER' should be vDATE-rREV)!"
+ GITHASH_ERR=true
+ else
+ GITHASH_ERR=false
+ fi
+ ## Parse handoff_file contents for BUILD_ARCHIVE_LOC (Where files were stored), HOST and MAVEN_TAG
BUILD_ARCHIVE_LOC=`cat ${handoff_file} | cut -d' ' -f1 | cut -d'=' -f2`
if [ "${BUILD_ARCHIVE_LOC}" = "" ] ; then
- echo "BUILD_ARCHIVE_LOC ${handoff_content_error}"
- exit 2
+ echo "BUILD_ARCHIVE_LOC ${handoff_content_error1}"
+ echo " ${handoff_content_error2}"
+ BUILD_ARCHIVE_LOC_ERR=true
+ else
+ BUILD_ARCHIVE_LOC_ERR_ERR=false
fi
HOST=`cat ${handoff_file} | cut -d' ' -f2 | cut -d'=' -f2`
if [ "${HOST}" = "" ] ; then
- echo "HOST ${handoff_content_error}"
- exit 2
+ echo "HOST ${handoff_content_error1}"
+ echo " ${handoff_content_error2}"
+ HOST_ERR=true
+ else
+ HOST_ERR=false
+ fi
+ MAVEN_TAG=`cat ${handoff_file} | cut -d' ' -f3 | cut -d'=' -f2`
+ if [ "${MAVEN_TAG}" = "" ] ; then
+ echo "MAVEN_TAG ${handoff_content_error1}"
+ echo " ${handoff_content_error2}"
+ MAVEN_TAG_ERR=true
+ else
+ MAVEN_TAG_ERR=false
+ fi
+ ## Parse MAVEN_TAG for VERSION
+ VERSION=`echo ${MAVEN_TAG} | cut -d'-' -f1`
+ if [ "${VERSION}" = "" ] ; then
+ echo "VERSION Error: Something wrong with MAVEN_TAG ('${MAVEN_TAG}' should be VERSION-MILESTONE}!"
+ ## If parsing MAVEN_TAG failed, try parsing BUILD_ARCHIVE_LOC
+ VERSION=`echo ${BUILD_ARCHIVE_LOC} | cut -d'/' -f6`
+ if [ "${VERSION}" = "" ] ; then
+ echo "VERSION (attempt 2) Error: Something wrong with BUILD_ARCHIVE_LOC '${BUILD_ARCHIVE_LOC}'!"
+ VERSION_ERR=true
+ else
+ VERSION_ERR=false
+ fi
+ else
+ VERSION_ERR=false
+ fi
+ ## Parse handoff_file directory listing for TIMESTAMP
+ TIMESTAMP=`ls -l --time-style=+%Y%m%d%H%M.%S ${handoff_file} | cut -d' ' -f6`
+ if [ "${TIMESTAMP}" = "" ] ; then
+ echo "TIMESTAMP error: Dir listing failed!"
+ TIMESTAMP_ERR=true
+ else
+ TIMESTAMP_ERR=false
fi
if [ "${DEBUG}" = "true" ] ; then
- echo "BRANCH='${BRANCH}' QUALIFIER='${QUALIFIER}' PROC='${PROC}' HOST='${HOST}' BUILD_ARCHIVE_LOC='${BUILD_ARCHIVE_LOC}'"
+ echo "parseHandoff: Parsed values:"
+ echo " BRANCH = '${BRANCH}'"
+ echo " QUALIFIER = '${QUALIFIER}'"
+ echo " PROC = '${PROC}'"
+ echo " BLDDATE = '${BLDDATE}'"
+ echo " GITHASH = '${GITHASH}'"
+ echo " BUILD_ARCHIVE_LOC= '${BUILD_ARCHIVE_LOC}'"
+ echo " HOST = '${HOST}'"
+ echo " MAVEN_TAG = '${MAVEN_TAG}'"
+ echo " VERSION = '${VERSION}'"
+ echo " TIMESTAMP = '${TIMESTAMP}'"
+ fi
+}
+
+unset publishBuildArtifacts
+publishBuildArtifacts() {
+ # Usage: publishBuildArtifacts src dest version date timestamp
+ src=$1
+ dest=$2
+ version=$3
+ date=$4
+ timestamp=$5
+
+ echo "Processing Build archives for publishing..."
+ rootDest=${dest}/nightly
+
+ #verify src, root dest, and needed variables exist before proceeding
+ if [ \( -d "${src}" \) -a \( -d "${rootDest}" \) -a \( ! "${version}" = "" \) -a \( ! "${date}" = "" \) -a \( ! "${timestamp}" = "" \) ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: Required locations and data verified... proceeding..."
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " date = '${date}'"
+ echo " timestamp = '${timestamp}'"
+ fi
+
+ #Mk download destination dir (dest/nightly/<version>/<date>)
+ downloadDest=${rootDest}/${version}/${date}
+ createPath ${downloadDest}
+
+ #force <date> dir's date attribute to date of handoff
+ touch -t${timestamp} ${downloadDest}
+
+ #count number of jars exported, and copy them preserving date
+ srcJarCount=`ls ${src} | grep -c [.]jar$`
+ if [ "${srcJarCount}" -gt 0 ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: Copying ${srcJarCount} jar(s)"
+ echo " from: '${src}'"
+ echo " to: '${downloadDest}'"
+ fi
+ cp --preserve=timestamps ${src}/*.jar ${downloadDest}/.
+ fi
+ destJarCount=`ls ${downloadDest} | grep -c [.]jar$`
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: ${destJarCount} jar(s) copied."
+ fi
+
+ #count number of archives (zips) exported, and copy them preserving date
+ srcZipCount=`ls ${src} | grep -c [.]zip$`
+ if [ "${srcZipCount}" -gt 0 ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: Copying ${srcZipCount} zip(s)"
+ echo " from: '${src}'"
+ echo " to: '${downloadDest}'"
+ fi
+ cp --preserve=timestamps ${src}/*.zip ${downloadDest}/.
+ fi
+ destZipCount=`ls ${downloadDest} | grep -c [.]zip$`
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: ${destZipCount} zips copied."
+ fi
+
+ #verify everything copied correctly
+ if [ \( "${srcJarCount}" = "${destJarCount}" \) -a \( "${srcZipCount}" = "${destZipCount}" \) ] ; then
+ echo " Published ${destJarCount} jar(s) and ${destZipCount} zip(s) successfully."
+ fi
+ else
+ # Something is not right! skipping.."
+ echo " Required locations and data failed to verify... skipping Artifact publishing...."
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishBuildArtifacts: Required locations and data:"
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " date = '${date}'"
+ echo " timestamp = '${timestamp}'"
+ fi
+ fi
+}
+
+unset publishMavenRepo
+publishMavenRepo() {
+ #Need handoff_loc, download location, version, date/time
+ src=$1
+ dest=$2
+ version=$3
+ timestamp=$4
+
+ #Mk download destination dir (DNLD_DIR/nightly/<version>/<date>
+ createPath ${dest}
+
+ #force <date> dir's date attribute to date of handoff
+ touch -t$timestamp ${dest}
+ #verify eclipselink.jar exist, copy preserving timestamp if it does
+ #count number of zrchives (zips) exported, and copy them preserving date
+ #verify everything copied
+}
+
+unset publishP2Repo
+publishP2Repo() {
+ #Need handoff_loc, download location, version, date/time, qualifier
+ # Usage: publishP2Repo src dest version qualifier
+ src=$1
+ dest=$2
+ version=$3
+ qualifier=$4
+
+ echo "Preparing to publish P2 repository...."
+ rootDest=${dest}/nightly-updates
+
+ #verify src, root dest, and needed variables exist before proceeding
+ if [ \( -d "${src}" \) -a \( -d "${rootDest}" \) -a \( ! "${version}" = "" \) -a \( ! "${qualifier}" = "" \) ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishP2Repo: Required locations and data verified... proceeding..."
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " qualifier= '${qualifier}'"
+ fi
+
+ #count number of repos exported (should be 0 or 1)
+ #if not 0 and dir repo not already published, copy it preserving timestamps
+ srcP2Count=`ls ${src} | grep -c p2repo`
+ downloadDest=${rootDest}/${version}.${qualifier}
+ if [ \( ! "${srcP2Count}" = "0" \) -a \( ! -d ${downloadDest} \) ] ; then
+ #Create download destination dir (dest/nightly-updates/<version>.<qualifier>)
+ createPath ${downloadDest}
+
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishP2Repo: Copying ${srcHtmlCount} html(s)"
+ echo " from: '${src}'"
+ echo " to: '${downloadDest}'"
+ fi
+ cp -r --preserve=timestamps ${src}/p2repo/* ${downloadDest}
+
+ destP2Count=`ls ${downloadDest} | grep -c [.]jar$`
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishP2Repo: ${destP2Count} jars in copied repo."
+ fi
+
+ #verify everything copied correctly
+ if [ "${destP2Count}" -gt 0 ] ; then
+ echo " Published ${destP2Count} repo successfully."
+ # run scrip tthat cleans pld builds from repo.
+
+
+ #regen composite repo after new child copied.
+ echo "TODO: regen composite at ${downloadDest}"
+ if [ -f ./buildCompositeP2.sh ] ; then
+ ./buildCompositeP2.sh ${rootDest} ""EclipseLink Nightly Build Repository""
+ fi
+ else
+ echo " Publish failed for P2 Repo."
+ rm -r ${downloadDest}
+ fi
+ else
+ echo " No P2 repo to publish..."
+ fi
+ else
+ # Something is not right! skipping.."
+ echo " Required locations and data failed to verify... skipping Repo publishing...."
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishP2Repo: Required locations and data:"
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " qualifier= '${qualifier}'"
+ fi
+ fi
+}
+
+
+unset publishTestArtifacts
+publishTestArtifacts() {
+ # Usage: publishTestArtifacts src dest version date host
+ src=$1
+ dest=$2
+ version=$3
+ date=$4
+ host=$5
+
+ echo "Processing Test Results for publishing..."
+ rootDest=${dest}/nightly
+
+ #verify src, root dest, and needed variables exist before proceeding
+ if [ \( -d "${src}" \) -a \( -d "${rootDest}" \) -a \( ! "${version}" = "" \) -a \( ! "${date}" = "" \) -a \( ! "${host}" = "" \) ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishTestArtifacts: Required locations and data verified... proceeding..."
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " date = '${date}'"
+ echo " host = '${host}'"
+ fi
+
+ #Mk download destination dir (dest/nightly/<version>/<date>)
+ downloadDest=${rootDest}/${version}/${date}/${host}
+ createPath ${downloadDest}
+
+ #count number of pages (html) exported, and copy them preserving date
+ srcHtmlCount=`ls ${src} | grep -c [.]html$`
+ if [ ! "${srcHtmlCount}" = "0" ] ; then
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishTestArtifacts: Copying ${srcHtmlCount} html(s)"
+ echo " from: '${src}'"
+ echo " to: '${downloadDest}'"
+ fi
+ cp --preserve=timestamps ${src}/*.html ${downloadDest}/.
+ fi
+ destHtmlCount=`ls ${downloadDest} | grep -c [.]html$`
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishTestArtifacts: ${destHtmlCount} htmls copied."
+ fi
+
+ #verify everything copied correctly
+ if [ "${srcHtmlCount}" = "${destHtmlCount}" ] ; then
+ echo " Published ${destHtmlCount} html(s) successfully."
+ else
+ echo " Publish failed for Test Results."
+ fi
+ else
+ # Something is not right! skipping.."
+ echo " Required locations and data failed to verify... skipping Artifact publishing...."
+ if [ "${DEBUG}" = "true" ] ; then
+ echo "publishTestArtifacts: Required locations and data:"
+ echo " src = '${src}'"
+ echo " rootDest = '${rootDest}'"
+ echo " version = '${version}'"
+ echo " date = '${date}'"
+ echo " timestamp = '${timestamp}'"
+ fi
fi
}
@@ -91,7 +426,7 @@
if [ ! "${BRANCH}" = "master" ] ; then
# Need to figure out version
- else
+ #else
$Need to figure out version
BRANCH=$Version
fi
@@ -113,20 +448,6 @@
# Export run specific variables
export BLD_DEPS_DIR BRANCH_NM BRANCH_PATH CLASSPATH JUNIT_HOME TARGET
- ## Parse $QUALIFIER for build date value
- BLDDATE=`echo ${QUALIFIER} | cut -s -d'-' -f1 | cut -s -dv -f2`
- if [ "${BLDDATE}" = "" ] ; then
- echo "BLDDATE Error: There is something wrong with QUALIFIER. ('$QUALIFIER' should be vDATE-rREV)!"
- exit 2
- fi
-
- ## Parse $QUALIFIER for SVN revision value
- GITHASH=`echo ${QUALIFIER} | cut -s -d'-' -f2`
- if [ "${GITHASH}" = "" ] ; then
- echo "GITHASH Error: There is something wrong with QUALIFIER. ('$QUALIFIER' should be vDATE-rREV)!"
- exit 2
- fi
-
# Setup parameters for Ant build
ANT_BASEARG="-f \"${ant.buildfile}\" -Dbranch.name=\"${BRANCH}\" -Dgit.hash=${GITHASH}"
ANT_BASEARG="${ANT_BASEARG} -Dbuild.date=${BLDDATE} -Dhandoff.file=${handoff}"
@@ -140,7 +461,7 @@
echo "${PROC} publish started at: '`date`' for ${BRANCH} build:${QUALIFIER} from '`pwd`'..." >> ${DATED_LOG}
echo " ant ${ANT_BASEARG} publish-${PROC}"
echo "ant ${ANT_BASEARG} publish-${PROC}" >> ${DATED_LOG}
- if [ ! "$DEBUG" = "true" ] ; then
+ if [ ! "${DEBUG}" = "true" ] ; then
#ant ${ANT_BASEARG} publish-${PROC} >> ${DATED_LOG} 2>&1
echo "Not running: ant ${ANT_BASEARG} publish-${PROC}"
fi
@@ -169,7 +490,25 @@
echo "Detected handoff file:'${handoff}'. Process starting..."
# Do stuff
parseHandoff ${handoff}
- runAnt ${BRANCH} ${QUALIFIER} ${PROC} ${BUILD_ARCHIVE_LOC} ${HOST}
+ if [ "$PROC" = "build" ] ; then
+ publishBuildArtifacts ${BUILD_ARCHIVE_LOC} ${DNLD_DIR} ${VERSION} ${BLDDATE} ${TIMESTAMP}
+ publishP2Repo ${BUILD_ARCHIVE_LOC} ${DNLD_DIR} ${VERSION} ${QUALIFIER}
+
+ else
+ publishTestArtifacts ${BUILD_ARCHIVE_LOC} ${DNLD_DIR} ${VERSION} ${BLDDATE} ${HOST}
+ fi
+ #runAnt ${BRANCH} ${QUALIFIER} ${PROC} ${BUILD_ARCHIVE_LOC} ${HOST}
echo "Done."
done
+ # ${DNLD_DIR}
+ # ${BRANCH}
+ # ${QUALIFIER}
+ # ${PROC}
+ # ${BLDDATE}
+ # ${GITHASH}
+ # ${BUILD_ARCHIVE_LOC}
+ # ${HOST}
+ # ${MAVEN_TAG}
+ # ${VERSION}
+ # ${TIMESTAMP}
