See http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/128/

------------------------------------------
A timer trigger started this job
Building remotely on hudson
Updating https://svn.nuxeo.org/nuxeo/tools/qa/nuxeo-integration-release/trunk
At revision 33376
no change for 
https://svn.nuxeo.org/nuxeo/tools/qa/nuxeo-integration-release/trunk since the 
previous build
[FT-nuxeo-5.2-funkload-bench] $ /bin/sh -xe /tmp/hudson21111.sh
+ cd trunk
+ export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun/
+ export 
PATH=/opt/apache-maven-2.0.10/bin/:/usr/lib/jvm/java-1.5.0-sun//bin/:/usr/lib/jvm/java-6-sun/bin:/opt/java/bin/:/usr/local/bin:/opt/maven/bin:/opt/ant/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+ PGPASSWORD=secret DBPORT=5432 
JBOSS_ARCHIVE=/home/hudson/appservers/jboss-4.2.3.GA.zip ./build-and-bench.sh
+++ dirname ./build-and-bench.sh
++ cd .
++ pwd -P
+ HERE=http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk 
+ . 
http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/integration-lib.sh
 
++++ dirname ./build-and-bench.sh
+++ cd .
+++ pwd -P
++ HERE=http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk 
++ NXVERSION=5.2
++ 
NXDIR=http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/src-5.2
 
++ JBOSS_ARCHIVE=/home/hudson/appservers/jboss-4.2.3.GA.zip
++ 
JBOSS_HOME=http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/jboss
 
++ DBPORT=5432
++ DBNAME=qualiscope-ci-8
++ PGSQL_LOG=/var/log/pgsql
++ 
PGSQL_OFFSET=http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/128/artifact/trunk/jboss/server/default/log/pgsql.offset
 
++ LOGTAIL=/usr/sbin/logtail
+ rm -rf ./jboss ./results ./download ./report
+ mkdir ./results ./download
+ update_distribution_source
+ '[' '!' -d 
http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/src-5.2  ']'
+ cd 
http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/src-5.2 
+ hg pull
pulling from http://hg.nuxeo.org/nuxeo/
searching for changes
no changes found
+ hg up -C 5.2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ '[' '!' -d 
http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/src-5.2/nuxeo-distribution
  ']'
+ cd 
http://qa.nuxeo.org/hudson/job/FT-nuxeo-5.2-funkload-bench/ws/trunk/src-5.2/nuxeo-distribution
 
+ hg pull
pulling from http://hg.nuxeo.org/nuxeo/nuxeo-distribution
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 14 changes to 13 files (+2 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
+ hg up 5.2
merging nuxeo-distribution-dm/ftest/funkload/nuxeo/pages.py
warning: conflicts during merge.
merging nuxeo-distribution-dm/ftest/funkload/nuxeo/pages.py failed!
4 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges with locally modified files.
You can redo the full merge using:
  hg update 474
  hg update 484
+ exit 1
Archiving artifacts
Sending notification to: [email protected]

_______________________________________________
ECM-QA mailing list
[email protected]
http://lists.nuxeo.com/mailman/listinfo/ecm-qa

Reply via email to