Fix #73 pgi

CMakeLists.txt

@@ -18,7 +18,7 @@
 # If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.5)
 
 OPTION(VAMPIR_ENABLE "create picongpu with vampir support" OFF)
 

buildsystem/CompileSuite/autoTests/compileRun.sh

@@ -32,7 +32,7 @@
 #
 
 user="picman"
-numParallel=3
+numParallel=2
 
 exch="/home/"$user"/exchange"
 picExport=$exch"/pic_export"

buildsystem/CompileSuite/autoTests/config.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2013 Axel Huebl             
+# Copyright 2013 Axel Huebl
 #
 # This file is part of PIConGPU.
 #
@@ -21,11 +21,10 @@
 
 # global configs ##############################################################
 #
-cnf_branches[0]="branches/dev"
+cnf_scheduler_secret="..."
+cnf_scheduler="https://example.com?client="$cnf_scheduler_secret
 
-
-cnf_queue="queue.cnf"
-cnf_svndir="$HOME/pic_svn/"
+cnf_gitdir="$HOME/pic_git/"
 cnf_exportdir="$HOME/pic_export/"
 cnf_extfile="$HOME/machines/exchange.ext2"
 
@@ -40,7 +39,7 @@ cnf_numParallel=2
 
 # send a congrats mail if N commits in a row where successful
 # (kind of a heart beat for this script)
-cnf_congrats=3
+cnf_congrats=10
 
 # mail settings
 cnf_smtp="smtp.example.com:25"

buildsystem/CompileSuite/autoTests/get_work.sh

@@ -0,0 +1,125 @@
+#!/bin/bash
+#
+# Copyright 2013 Axel Huebl
+#
+# This file is part of PIConGPU.
+#
+# PIConGPU is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# PIConGPU is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with PIConGPU.
+# If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Contact the scheduler and request a new task to work on
+# create a read only, clean source
+# image
+
+thisDir=$(cd `dirname $0` && pwd)"/"
+
+. "$thisDir"config.sh
+
+security_check $thisDir
+
+# clean up old stuff
+#
+rm -rf $cnf_gitdir/* $cnf_gitdir/.git*
+mkdir -p $cnf_gitdir
+cd $cnf_gitdir
+rm -rf $cnf_exportdir
+mkdir -p $cnf_exportdir
+
+# check for work
+#
+sched=`curl -d'payload={"action":"request"}' $cnf_scheduler 2>/dev/null`
+if [ $? -ne 0 ]; then
+    echo "Error contacting scheduler at $cnf_scheduler"
+    exit 1
+fi
+
+# decode JSON escaped strings
+#
+sched=${sched//\\\\/\\} # \
+sched=${sched//\\\//\/} # /
+sched=${sched//\\\'/\'} # '
+sched=${sched//\\\"/\"} # "
+sched=${sched//\\\t/	} # \t
+sched=${sched//\\\n/
+} # \n
+sched=${sched//\\\r/^M} # \r
+sched=${sched//\\\f/^L} # \f
+sched=${sched//\\\b/^H} # \b
+
+workType=`echo -e "$sched" | grep '"etype"' | awk -F':' '{print $2}' | awk -F'"' '{print $2}'`
+
+# HEAD commit properties
+eventid=`echo -e "$sched" | grep '"id"' | head -n1 | awk -F'":' '{print $2}' | awk -F',' '{print $1}'`
+owner=`echo -e "$sched" | grep '"owner"' | head -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+repo=`echo -e "$sched" | grep '"repo"' | head -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+git=`echo -e "$sched" | grep '"git"' | head -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+sha=`echo -e "$sched" | grep '"sha"' | head -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+
+echo $eventid > "$thisDir"runGuard
+
+if [ "$workType" == "commit" ]
+then
+    git clone -q $git .
+    git checkout -q $sha
+elif [ "$workType" == "pull" ]
+then
+    # BASE repos commit properties
+    owner_b=`echo -e "$sched" | grep '"owner"' | tail -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+    repo_b=`echo -e "$sched" | grep '"repo"' | tail -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+    git_b=`echo -e "$sched" | grep '"git"' | tail -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+    sha_b=`echo -e "$sched" | grep '"sha"' | tail -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+
+    branch=`echo -e "$sched" | grep '"branch"' | head -n1 | awk -F'":' '{print $2}' | awk -F'"' '{print $2}'`
+
+    git clone -q $git_b .
+    git checkout -q -b mergeTest $sha_b
+    git pull -q $git $branch
+    if [ $? -ne 0 ] ; then
+        # merge failed
+        cd -
+        exit 2
+    fi
+else
+    cd -
+    exit 1
+fi
+
+rsync -a --exclude=.git . $cnf_exportdir
+
+# iso
+#genisoimage -D -iso-level 4 -quiet \
+#  -input-charset=iso8859-1 \
+#  -o $cnf_isofile $cnf_exportdir
+
+# raw (loop dev)
+rm -rf $cnf_extfile
+qemu-img create -f raw $cnf_extfile 1G
+/sbin/mke2fs -q -F $cnf_extfile
+
+mntdir=$thisDir"tmp_mount"
+mkdir $mntdir
+fuseext2 -o rw+ $cnf_extfile $mntdir
+
+mkdir $mntdir/pic_export
+cp $thisDir"compileRun.sh" $mntdir/
+cp -R $cnf_exportdir/* $mntdir/pic_export
+
+# unmount
+sync
+fusermount -u $mntdir
+rm -rf $mntdir
+
+# go back
+cd -

buildsystem/CompileSuite/autoTests/new_commits.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2013 Axel Huebl             
+# Copyright 2013 Axel Huebl
 #
 # This file is part of PIConGPU.
 #
@@ -24,7 +24,7 @@
 thisDir=$(cd `dirname $0` && pwd)"/"
 
 . "$thisDir"config.sh
-. "$thisDir"mails.sh
+. "$thisDir"report.sh
 
 security_check
 
@@ -36,41 +36,56 @@ touch "$thisDir"runGuard
 
 # loop through each branch for new commits
 #
-cd $cnf_svndir
+cd $cnf_gitdir
 
 # loop branches
-for b in "${cnf_branches[@]}"
-do
-    cd $b
+#for b in "${cnf_branches[@]}"
+#do
+#    cd $b
 
-    # loop commits
+    # loop work
     finished=0
     while [ "$finished" -eq "0" ]
     do
-        myRev=`svnversion`
-        rev=$(( myRev + 1 ))
-        "$thisDir"update_branch.sh $b $rev
+        "$thisDir"get_work.sh
         finished=$?
 
-        # was this branch affected?
-        if [ "$finished" -eq "0" ]; then
-            logEntry=`svn log -v -r $rev`
-            commitLine=`echo $logEntry | sed 's/-//g'`
-            if [ -z "$commitLine" ] ; then
-                finished=1
+        # merge conflict occuted
+        if [ "$finished" -eq "2" ]; then
+            # clean message as failure
+            echo "Merge conflict detected. Aborting..."
+
+            state=-1
+            # git log infos
+            logEntry=`git log -1`
+            lastUser=`git log -1 --format=%an`
+            lastUserMail=`git log -1 --format=%ae`
+            if [ -z "$lastUserMail" ] ; then
+                lastUserMail="[email protected]"
             fi
+            sha=`git log -1 --format=%H`
+            eventid=`cat "$thisDir"runGuard`
+
+            # create conclusion, update status (and send mails)
+            conclusion "$state" "$lastUser" "$lastUserMail" "$sha" "$eventid" "$logEntry" "$thisDir""runGuard"
         fi
 
         # new version! :)
         if [ "$finished" -eq "0" ]; then
             # state of this test
             state=0 #0: suite errored, <0 compile failed, >0: ok
 
-            # svn log infos
-            logEntry=`svn log -v -r $rev`
-            lastUser=`echo "$logEntry" | head -n 2 | tail -n 1 | awk -F"|" '{print $2}'`
+            # git log infos
+            logEntry=`git log -1`
+            lastUser=`git log -1 --format=%an`
+            lastUserMail=`git log -1 --format=%ae`
+            if [ -z "$lastUserMail" ] ; then
+                lastUserMail="[email protected]"
+            fi
+            sha=`git log -1 --format=%H`
+            eventid=`cat "$thisDir"runGuard`
 
-            echo "Testing new version $b:$rev"
+            echo "Testing new commit"
 
             cp $cnf_imgSrc $cnf_imgClone
             echo "Base System Image cloned..."
@@ -134,8 +149,8 @@ do
             # update lastRun history
             echo $state > "$thisDir"lastRun.log
 
-            # create conclusion and send mails
-            conclusion "$state" "$lastUser" "$b" "$rev" "$logEntry" "$mntdir""/output"
+            # create conclusion, update status (and send mails)
+            conclusion "$state" "$lastUser" "$lastUserMail" "$sha" "$eventid" "$logEntry" "$mntdir""/output"
 
             # unmount
             fusermount -u $mntdir
@@ -148,8 +163,8 @@ do
         fi
     done
 
-    cd $cnf_svndir
-done
+    cd $cnf_gitdir
+#done
 
 # del guard
 rm "$thisDir"runGuard