Author: lzoubek(a)redhat.com Date: 2011-03-25 09:15:51 -0400 (Fri, 25 Mar 2011) New Revision: 30029 Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-performance.properties Log: perf tests: working saving results to network DB, fixed generating correct buildID and config Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-25 12:55:46 UTC (rev 30028) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-25 13:15:51 UTC (rev 30029) @@ -2,6 +2,7 @@ <project default="get-deps-all"> <property environment="env"/> <property file="jbt-perf-prepare.properties" /> + <property name="eclipse.site" value="http://download.eclipse.org" /> <!-- <property name="mirror" value="http://carroll.aset.psu.edu/pub/eclipse" /> --> @@ -10,7 +11,6 @@ <property name="workdir" value="work" /> <property name="libdir" value="${jbt.dependencies.folder}" /> <property name="tmpdir" value="tmp" /> - <property name="get.zip.jboss.tools" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> <condition property="ext.win" value=".zip" else=""> <os family="windows" /> </condition> @@ -50,24 +50,51 @@ </groovy> </target> <target name="get-dependencies"> - <property name ="zip.eclipse.platform" value="eclipse-platform-3.6-${os.win}${os.linux}${arch.x86_64}${ext.linux}${ext.win}" /> - <property name="zip.eclipse.j2ee" value="eclipse-jee-helios-${os.win}${os.linux}${arch.x86_64}${ext.linux}${ext.win}" /> + <groovy> + properties['zip.jboss.tools.skipexisting']=true + if (!properties['get.zip.jboss.tools']) { + println 'Update-site zip not defined, determining default (nightly trunk)' + link = 'http://download.jboss.org/jbosstools/builds/nightly/trunk/latestBuild.html' + ant.get(dest:properties['tmpdir'],src:link) + latest = new File(properties['tmpdir']+'/latestBuild.html').getText() + match = latest.trim() =~ '.*url=([\\d\\w\\_\\-]+).*' + if (match.matches()) { + latest = match[0][1]; + } + link=link.replaceAll('latestBuild.html',latest) + link+='/all' + ant.get(dest:properties['tmpdir']+'/index',src:link) + latest = new File(properties['tmpdir']+'/index').getText() + match = latest.trim().eachMatch('.*href=\\"([\\.\\w\\d\\-]+Update[\\-\\w\\.\\d]+zip).*') { + latest = it[1] + } + link = link+='/'+latest + properties['get.zip.jboss.tools'] = link + // always overwrite upd-site zipfile when using trunk + properties['zip.jboss.tools.skipexisting']=false + } + def zip = properties['get.zip.jboss.tools'].replaceAll('.*\\/','') + properties['zip.jboss.tools']=zip + </groovy> - <property name="get.zip.eclipse.platform" value="${mirror}/eclipse/downloads/drops/R-3.6-201006080911/${zip.eclipse.platform}" /> - <property name="md5.eclipse.platform" value="http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201... /> - <property name="zip.test.framework" value="eclipse-test-framework-3.6.zip" /> - <property name="get.zip.test.framework" value="${mirror}/eclipse/downloads/drops/R-3.6-201006080911/${zip.test.framework}" /> - <property name="md5.test.framework" value="http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201... /> - <property name="zip.eclipse.automated" value="eclipse-Automated-Tests-3.6.zip" /> - <property name="get.zip.eclipse.automated" value="${mirror}/eclipse/downloads/drops/R-3.6-201006080911/${zip.eclipse.automated}" /> - <property name="md5.eclipse.automated" value="http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201... /> - <property name="get.zip.eclipse.j2ee" value="${mirror}/technology/epp/downloads/release/helios/R/${zip.eclipse.j2ee}" /> + <property name="eclipse.drops" value="/eclipse/downloads/drops/R-3.6.2-201102101200" /> + + <property name="zip.eclipse.platform" value="eclipse-platform-3.6.2-${os.win}${os.linux}${arch.x86_64}${ext.linux}${ext.win}" /> + <property name="get.zip.eclipse.platform" value="${mirror}/${eclipse.drops}/${zip.eclipse.platform}" /> + <property name="md5.eclipse.platform" value="${mirror}/${eclipse.drops}/checksum/${zip.eclipse.platform}.md5" /> + + <property name="zip.test.framework" value="eclipse-test-framework-3.6.2.zip" /> + <property name="get.zip.test.framework" value="${mirror}/${eclipse.drops}/${zip.test.framework}" /> + <property name="md5.test.framework" value="${mirror}/${eclipse.drops}/checksum/${zip.test.framework}.md5" /> + + <property name="zip.eclipse.automated" value="eclipse-Automated-Tests-3.6.2.zip" /> + <property name="get.zip.eclipse.automated" value="${mirror}/${eclipse.drops}/${zip.eclipse.automated}" /> + <property name="md5.eclipse.automated" value="${mirror}/${eclipse.drops}/checksum/${zip.eclipse.automated}.md5" /> + + <property name="zip.eclipse.j2ee" value="eclipse-jee-helios-SR2-${os.win}${os.linux}${arch.x86_64}${ext.linux}${ext.win}" /> + <property name="get.zip.eclipse.j2ee" value="${mirror}/technology/epp/downloads/release/helios/SR2/${zip.eclipse.j2ee}" /> <property name="md5.eclipse.j2ee" value="${get.zip.eclipse.j2ee}.md5" /> - <groovy> - def zip = properties['get.zip.jboss.tools'].replaceAll('.*\\/','') - properties['zip.jboss.tools']=zip - </groovy> <property name="get.zip.derby.plugin" value="http://apache.thelorne.com//db/derby/db-derby-10.6.1.0/derby_... /> <property name="zip.derby.plugin" value="derby_core_plugin_10.6.1.zip" /> @@ -81,7 +108,7 @@ <get-and-checksum pattern="{0} *{1}" dir="${libdir}" md5="${md5.eclipse.platform}" dst="${zip.eclipse.platform}" src="${get.zip.eclipse.platform}" /> <get-and-checksum pattern="{0} *{1}" dir="${libdir}" md5="${md5.eclipse.automated}" dst="${zip.eclipse.automated}" src="${get.zip.eclipse.automated}" /> <get-and-checksum pattern="{0} {1}" dir="${libdir}" md5="${md5.eclipse.j2ee}" dst="${zip.eclipse.j2ee}" src="${get.zip.eclipse.j2ee}" /> - <get dest="${libdir}/${zip.jboss.tools}" skipexisting="true" src="${get.zip.jboss.tools}"/> + <get dest="${libdir}/${zip.jboss.tools}" skipexisting="${zip.jboss.tools.skipexisting}" src="${get.zip.jboss.tools}"/> <!-- <get-and-checksum pattern="MD5 ({1}) = {0}" dir="${libdir}" md5="${md5.derby.plugin}" dst="${zip.derby.plugin}" src="${get.zip.derby.plugin}"/> <move file="${libdir}/${zip.derby.plugin}" tofile="${libdir}/org.apache.derby_1.0.0.zip" /> @@ -121,16 +148,31 @@ features = features.substring(1) def output=properties['destdir']+'/jboss-tools-'+version+'.zip' println 'Detetected JBoss Tools version '+version - majorVersion = '0.0.0' + majorVersion = '3.2.0' // jbosstools-3.2.0.M2.aggregate-Update-2010-09-08_17-17-54-H243a.zip match = properties['get.zip.jboss.tools'] =~ '.*/jbosstools-(\\d\\.\\d\\.\\d).*' if (match.matches()) majorVersion = match[0][1] - + + majorVersion='R-'+majorVersion println 'Setting up properties' properties['runtimeArchive']='../../jboss-tools-'+version+'.zip' + import java.text.SimpleDateFormat; buildID = version.split('-') - properties['perf.buildID'] = majorVersion+'_'+buildID[0] + buildID[1]+'_'+buildID[0] + buildID[1] + buildType = properties['jbt.build.type'] + if ('R'.equals(buildType)) + { + cal = Calendar.instance + df_date = new SimpleDateFormat("yyyyMMdd") + df_time = new SimpleDateFormat("HHmm") + properties['perf.buildID'] = majorVersion+'_'+buildID[0] + buildID[1]+'_'+ df_date.format(cal.time)+ df_time.format(cal.time) + } + else if (buildType == 'x' ) { + properties['perf.buildID'] = 'I'+buildID[0]+'-'+buildID[1] + } + else { + ant.fail('Unexpected value of property jbt.built.type') + } if (properties['os.linux']!="") { properties['osgi.os']='linux' properties['osgi.ws']='gtk' Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties 2011-03-25 12:55:46 UTC (rev 30028) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties 2011-03-25 13:15:51 UTC (rev 30029) @@ -1,5 +1,20 @@ jbt.dependencies.folder=libs -jbt.host.desc=ram=4G;CPUs=2 + +# property with format config=<host config name>;jvm=<jvm name> +jbt.host.desc=config=Linux1;jvm=sun workdir=workdir + +# set of tests to run tests=all -jbt.perf.db.loc=${basedir}/db \ No newline at end of file +#tests=ant +# setup build Type: R - for release (GA, milestontes) - will be used for baselining +# x - otherwise +jbt.build.type=x +# URL of JBossTools build +#get.zip.jboss.tools=http://download.jboss.org/jbosstools/builds/nightly/3.2_stable_branch/2011-03-21_12-29-04-H586/all/jbosstools-3.2_stable_branch.aggregate-Update-2011-03-21_12-29-04-H586.zip +#database connection +# use //<IP> for network DB or <path> for local DB +#jbt.perf.db.loc=//derbydb.example.com +jbt.perf.db.loc=/tmp/perfdb +# setup connection properties +jbt.perf.db.props=create=true;dbname=jbt;dbuser=jbt;dbpasswd=pass Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-25 12:55:46 UTC (rev 30028) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-25 13:15:51 UTC (rev 30029) @@ -10,8 +10,9 @@ <istrue value="${noclean}"/> </and> </condition> + <!-- <mkdir dir="${jbt.perf.db.loc}"/> - + --> </target> <target name="prepare" depends="init,get-deps-all"> @@ -21,8 +22,8 @@ <property name="perf.buildID" value="3.2_201009081606_201009081606"/> --> <property name="perf.memory" value="-Xms256M -Xmx512M -XX:MaxPermSize=256M"/> - <property name="perf.db" value="-Declipse.perf.dbloc=${jbt.perf.db.loc};create=true;dbname=perfdb;dbuser=guest;dbpasswd=guest"/> - <property name="perf.config" value="-Declipse.perf.config=build=${perf.buildID};desc=${jbt.host.desc};os=${osgi.os};arch=${osgi.arch};jvm=sun"/> + <property name="perf.db" value="-Declipse.perf.dbloc=${jbt.perf.db.loc};${jbt.perf.db.props}"/> + <property name="perf.config" value="-Declipse.perf.config=build=${perf.buildID};${jbt.host.desc}"/> <condition property="perf.baseBuild" value="-Declipse.perf.assertAgainst=build=${perf.baseBuildID};host=localhost;jvm=sun" else=""> <and> <isset property="perf.baseBuildID"/> @@ -50,14 +51,15 @@ </target> <target name="run" depends="prepare"> - <java jar="workdir/eclipse/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar" fork="true" dir="workdir/eclipse-testing"> + <java jar="workdir/eclipse/plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar" fork="true" dir="workdir/eclipse-testing"> <jvmarg value="-Dosgi.os=${osgi.os} -Dosgi.ws=${osgi.ws} -Dosgi.arch=${osgi.arch}"/> <arg line="-data ../workspace"/> <arg line="-application org.eclipse.ant.core.antRunner"/> <arg line="-file jbt-performance.xml"/> <arg line="${tests}"/> <arg line="-Dos=${osgi.os} -Dws=${osgi.ws} -Darch=${osgi.arch}"/> - <arg line="-D${clean}=true"/> + <arg line="-D${clean}=true"/> + <arg line="-logger org.apache.tools.ant.DefaultLogger"/> <arg line="-Dvmargs='${perf.memory} ${perf.db} ${perf.config} ${perf.baseBuild}'"/> <arg line="-DruntimeArchive=${runtimeArchive}"/> @@ -72,5 +74,5 @@ <zip destfile="perfDB-${tstamp}.zip" basedir="${jbt.perf.db.loc}"/> </target> - <target name="all" depends="run, saveDB" /> -</project> \ No newline at end of file + <target name="all" depends="run" /> +</project> Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-performance.properties =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-performance.properties 2011-03-25 12:55:46 UTC (rev 30028) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-performance.properties 2011-03-25 13:15:51 UTC (rev 30029) @@ -1,13 +1,13 @@ #overrides for equinoxp2tests.properties #org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux=../../eclipse-platform-3.6-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux=../../eclipse-platform-3.6-linux-x86_64-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.win32=../../eclipse-platform-3.6-win32.zip +org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.linux=../../eclipse-platform-3.6.2-linux-x86_64-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.35.platform.archive.win32=../../eclipse-platform-3.6.2-win32.zip J2SE-5.0=/opt/sun-jdk-1.5.0.22/ -J2SE-6.0=/opt/sun-jdk-1.6.0.20/ +J2SE-6.0=/opt/sun-jdk-1.6.0.24/ #J2SE-5.0=/space/java/sdk/jdk1.5.0_22/ #J2SE-6.0=/space/java/sdk/jdk1.6.0_21/ #J2SE-5.0=c\:\\java\\jdk1.5.0_15 -#J2SE-6.0=c\:\\java\\jdk1.6.0_21 \ No newline at end of file +#J2SE-6.0=c\:\\java\\jdk1.6.0_21