Refined build scripts
diff --git a/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh b/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh index 0a3fd53..c3e0e00 100755 --- a/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh +++ b/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh
@@ -20,6 +20,8 @@ gitUser=xgu gitPass=xx +buildEclipseUser=xgu +buildEclipsePass=xx export GitRepo=ssh://${gitUser}@git.eclipse.org/gitroot/datatools/org.eclipse.datatools.build.git export BranchName=master rm -rf plugins @@ -82,6 +84,9 @@ # buildtype determines whether map file tags are used as entered or are replaced with HEAD buildType=I +# Integration Build, normally done on Friday +FridayBuild=false + # directory where to copy build postingDirectory=$HOME/releng/BIRTOutput/dtp.output/1.12.0 @@ -325,7 +330,7 @@ echo $tagMaps >> $USER.log echo $compareMaps >> $USER.log -PackageVersion=1.12.0M7-$timestamp +PackageVersion=1.12.0RC3-$timestamp echo "======[PackageVersion]: $PackageVersion" >> $USER.log #cp $HOME/releng.dtp.1120/dtpURLmonitor.properties $HOME/releng.260/src/ @@ -343,7 +348,7 @@ -Dbuild.date=$builddate -Dpackage.version=$PackageVersion \ -DmapGitRoot=ssh://${gitUser}@git.eclipse.org/gitroot/datatools \ -DmapVersionTag=$BranchName -DBranchVersion=1.12.0 \ --Dusername.sign=${gitUser} -Dpassword.sign=${gitPass} -Dhostname.sign=build.eclipse.org -Dhome.dir=/home/data/users/${gitUser} -Dsign.dir=/home/data/httpd/download-staging.priv/birt \ +-Dusername.sign=${buildEclipseUser} -Dpassword.sign=${buildEclipsePass} -Dhostname.sign=build.eclipse.org -Dhome.dir=/home/data/users/${buildEclipseUser} -Dsign.dir=/home/data/httpd/download-staging.priv/birt \ -Dorbit.url.token=download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins \ -Dorbit.url.newvalue=qa-build/BIRTOutput/platform/orbit-S20110521195923-Indigo/bundles" @@ -387,12 +392,12 @@ fi fi -#upload build to eclipse site +#upload build to Eclipse site if [ "$upload" = "true" ] then # expects DTP website Git repo is already checked out in datatools folder under the working directory cd $builderDir/uploadScripts - ant -f dtplogupload.1.12.0.xml -l log/dtplogupload.1.12.0.log - ant -f dtpupload.1.12.0.xml -l log/dtpupload.1.12.0.log + ant -f dtplogupload.1.12.0.xml -l log/dtplogupload.1.12.0.log -Dusername=${buildEclipseUser} -Dpassword=${buildEclipsePass} + ant -f dtpupload.1.12.0.xml -l log/dtpupload.1.12.0.log -Dusername=${buildEclipseUser} -Dpassword=${buildEclipsePass} -DintegrationBuild=${FridayBuild} fi
diff --git a/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtplogupload.1.12.0.xml b/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtplogupload.1.12.0.xml index a453a05..ce729b1 100644 --- a/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtplogupload.1.12.0.xml +++ b/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtplogupload.1.12.0.xml
@@ -49,6 +49,7 @@ <scp remoteTofile="${username}:${password}@${hostname}:${eclipse_dtp_path}/build.log" trust="true" file="${local_upload_path}/${buildVersionLog}"/> <sshexec host="${hostname}" username="${username}" password="${password}" trust="true" + failonerror="false" command="chmod g+w ${eclipse_dtp_path}/build.log" /> </target>
diff --git a/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtpupload.1.12.0.xml b/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtpupload.1.12.0.xml index 5873d0a..ae935d5 100644 --- a/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtpupload.1.12.0.xml +++ b/plugins/org.eclipse.datatools.releng.builder/uploadScripts/dtpupload.1.12.0.xml
@@ -35,8 +35,8 @@ <property name="local_dtp_path" value="${postingDirectory}/${buildId}"/> <property name="eclipse_dtp_path" value="~/downloads/datatools/downloads/drops/N_DTP_1.12.0"/> <property name="eclipse_staging_path" value="/home/data/httpd/download-staging.priv/birt"/> - <!--property name="local_version" value="RC1"/--> - <property name="M_version" value="M7"/> + <!--property name="local_version" value="RC3"/--> + <property name="M_version" value="RC3"/> <tstamp prefix="timestamp"> @@ -91,7 +91,8 @@ </scp> <scp remoteTofile="${username}:${password}@${hostname}:${eclipse_dtp_path}/directory_N.txt" trust="true" file="${local_dtp_path}/directory.txt"/> - <sshexec host="${hostname}" username="${username}" password="${password}" trust="true" + <sshexec host="${hostname}" username="${username}" password="${password}" trust="true" + failonerror="false" command="chmod g+w ${eclipse_dtp_path}/dtp-*1.12.0${M_version}-${timestamp}.zip ${eclipse_dtp_path}/directory_N.txt" /> </target> @@ -102,6 +103,7 @@ <fileset dir="${LocalUpdatesiteDir}" includes="compositeArtifacts.jar,compositeContent.jar"/> </scp> <sshexec host="${hostname}" username="${username}" password="${password}" trust="true" + failonerror="false" command="chmod -R g+w ${eclipse_dtp_path}/../N_updates_1.12.0/*.jar ${eclipse_dtp_path}/../N_updates_1.12.0/${buildId}" /> </target> @@ -135,14 +137,12 @@ </target> <target name="updategitfile"> + <property name="integrationBuild" value="false"/> <property file="lastmonitor_N_1120.properties"/> <property file="lastmonitor_I_1120.properties"/> <tstamp> <format property="downloads.php.pattern" pattern="M/d/yy"/> </tstamp> - <tstamp> - <format property="todayinweek" pattern="E"/> - </tstamp> <!--cvs command="update -C downloads.php" dest="www/datatools"/--> <echo message="Git pull ${DTP.website.repo}"/> @@ -167,7 +167,7 @@ match="dtp-incubator-1\.12\.0${lastMversion_N}-${lasttimestamp_N}\.zip(.*)(\s*)DTP Incubator 1\.12\.0${lastMversion_N}.*Nightly Build(.*)dtp-incubator-1\.12\.0${lastMversion_N}-${lasttimestamp_N}" replace="dtp-incubator-1.12.0${M_version}-${timestamp}.zip\1\2DTP Incubator 1.12.0${M_version} ${downloads.php.pattern} Nightly Build\3dtp-incubator-1.12.0${M_version}-${timestamp}"/--> <if> - <equals arg1="${todayinweek}" arg2="Fri"/> + <equals arg1="${integrationBuild}" arg2="true"/> <then> <replaceregexp file="${DTP.website.repo}/downloads.php" match="dtp-sdk-1\.12\.0${lastMversion_I}-${lasttimestamp_I}\.zip(.*)(\s*)DTP 1\.12\.0${lastMversion_I} SDK.*I-Build(.*)dtp-sdk-1\.12\.0${lastMversion_I}-${lasttimestamp_I}" @@ -178,9 +178,11 @@ <replaceregexp file="${DTP.website.repo}/downloads.php" match="dtp-p2repo-1\.12\.0${lastMversion_I}-${lasttimestamp_I}\.zip(.*)(\s*)DTP 1\.12\.0${lastMversion_I} P2 Repo.*I-Build(.*)dtp-p2repo-1\.12\.0${lastMversion_I}-${lasttimestamp_I}" replace="dtp-p2repo-1.12.0${M_version}-${timestamp}.zip\1\2DTP 1.12.0${M_version} P2 Repo ${downloads.php.pattern} I-Build\3dtp-p2repo-1.12.0${M_version}-${timestamp}"/> + <scp remoteTofile="${username}:${password}@${hostname}:${eclipse_dtp_path}/directory_I.txt" trust="true" file="${local_dtp_path}/directory.txt"/> <sshexec host="${hostname}" username="${username}" password="${password}" trust="true" + failonerror="false" command="chmod g+w ${eclipse_dtp_path}/directory_I.txt" /> </then> </if> @@ -198,7 +200,7 @@ lastMversion_N=${M_version} </echo> <if> - <equals arg1="${todayinweek}" arg2="Fri"/> + <equals arg1="${integrationBuild}" arg2="true"/> <then> <echo file="lastmonitor_I_1120.properties"> lasttimestamp_I=${timestamp} @@ -212,11 +214,11 @@ <target name="inform"> <mail from="DAILYBUILD@QA-SHA" tolist="xgu@actuate.com,lchan@actuate.com,bpayton@us.ibm.com" mailport="5025" - subject="Today's DTP 1.12.0 daily build is available (${buildId})"> + subject="Today's DTP 1.12.0 build is available (${buildId})"> <message> Hi All, -Today's DTP daily build is available at: +Today's DTP build is available at: SDK package: http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/drops/N_DTP_1.12.0/dtp-sdk-1.12.0${M_version}-${timestamp}.zip