socsvn commit: r301941 - in soc2015/kczekirda/master/cluster: . log obj usr usr/src usr/src298788

kczekirda at FreeBSD.org kczekirda at FreeBSD.org
Fri Apr 29 21:25:12 UTC 2016


Author: kczekirda
Date: Fri Apr 29 21:25:09 2016
New Revision: 301941
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=301941

Log:
  architecture changed

Added:
  soc2015/kczekirda/master/cluster/log/
  soc2015/kczekirda/master/cluster/obj/
  soc2015/kczekirda/master/cluster/run.sh
  soc2015/kczekirda/master/cluster/test.sh
  soc2015/kczekirda/master/cluster/usr/
  soc2015/kczekirda/master/cluster/usr/src/
  soc2015/kczekirda/master/cluster/usr/src298788/
Modified:
  soc2015/kczekirda/master/cluster/new_task.sh

Modified: soc2015/kczekirda/master/cluster/new_task.sh
==============================================================================
--- soc2015/kczekirda/master/cluster/new_task.sh	Fri Apr 29 20:56:58 2016	(r301940)
+++ soc2015/kczekirda/master/cluster/new_task.sh	Fri Apr 29 21:25:09 2016	(r301941)
@@ -1,24 +1,24 @@
 #!/bin/sh
 
-cd /cluster/usr/src
+curl="/usr/local/bin/curl"
+master="192.168.22.19:8080"
 
-while [ -e pid ]
-do
-    sleep 10
-done
+$curl http://$master/admin/change_task_status/$1/preparing
 
-touch pid
+zfs clone -o mountpoint=/cluster/usr/src$1 -o sharenfs='maproot=root' zroot/cluster/usr/src at current zroot/cluster/$1
 
-curl http://192.168.22.3:8080/admin/change_task_status/$1/preparing
+cd /cluster/usr/src$1
 
 svn up -r $1
 
-rsync -ahW --no-compress --exclude '.svn' /cluster/usr/src/ /cluster/$1/
+echo "export revision=$1" > /cluster/revision_$2
 
-echo "export revision=$1" > /cluster/$2/cluster/rev
+mkdir /cluster/log/$1
 
-curl http://192.168.22.3:8080/admin/change_boot/$2/cluster.ipxe
+chflags -R noschg /cluster/obj/$2/*
 
-curl http://192.168.22.3:8080/admin/change_task_status/$1/running
+rm -rf /cluster/obj/$2/*
+
+$curl http://$master/admin/change_boot/$2/cluster.ipxe
+$curl http://$master/admin/change_task_status/$1/running
 
-rm /cluster/usr/src/pid
\ No newline at end of file

Added: soc2015/kczekirda/master/cluster/run.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/master/cluster/run.sh	Fri Apr 29 21:25:09 2016	(r301941)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+export master="192.168.22.19:8080"
+export curl="/usr/local/bin/curl"
+export makelogdir="/cluster/log/$revision"
+export hostlogdir="/cluster/log/"
+
+export host=$(hostname)
+export nfs="192.168.22.19"
+. /cluster/revision_$host
+
+echo "CC=clang" >> /etc/make.conf
+echo "CXX=clang++" >> /etc/make.conf
+echo "CPP=clang-cpp" >> /etc/make.conf
+echo "WITH_FAST_DEPEND=yes" >> /etc/make.conf
+
+pkg update
+yes | pkg install curl
+
+mount -t nfs -o nolockd $nfs:/cluster/usr/src$revision /usr/src
+
+mount -t nfs -o nolockd $nfs:/cluster/obj/$host /usr/obj
+
+sh -x /cluster/test.sh > /cluster/log/$revision/log 2>&1 &

Added: soc2015/kczekirda/master/cluster/test.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/master/cluster/test.sh	Fri Apr 29 21:25:09 2016	(r301941)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+set -e
+
+cd /usr/src
+
+echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+echo $(date) >> $hostlogdir/$host.log
+echo "step: make buildworld" >> $hostlogdir/$host.log
+
+$curl http://$master/admin/change_node_status/$host/running
+$curl http://$master/admin/change_task_status/$revision/running
+
+if make -j8 buildworld; then
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	echo "step: make buildworld done" >> $hostlogdir/$host.log
+else
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	echo "step: make buildworld failed" >> $hostlogdir/$host.log
+	$curl http://$master/admin/change_node_status/$host/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$host/take_task.ipxe
+	reboot
+fi
+
+echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+echo $(date) >> $hostlogdir/$host.log
+echo "step: make buildkernel" >> $hostlogdir/$host.log
+
+if make -j8 buildkernel; then
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	echo "step: make buildkernel done" >> $hostlogdir/$host.log
+else
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	echo "step: make buildkernel failed" >> $hostlogdir/$host.log
+	$curl http://$master/admin/change_node_status/$host/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$host/take_task.ipxe
+	reboot
+fi
+
+echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+echo $(date) >> $hostlogdir/$host.log
+echo "step: make ftp start" >> $hostlogdir/$host.log
+
+cd /usr/src/release
+
+if make ftp; then
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	echo "step: make ftp done" >> $hostlogdir/$host.log
+else
+	echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+	echo "step: make ftp failed" >> $hostlogdir/$host.log
+	echo $(date) >> $hostlogdir/$host.log
+	$curl http://$master/admin/change_node_status/$host/rebooting
+	$curl http://$master/admin/change_task_status/$revision/failed
+	$curl http://$master/admin/change_boot/$host/take_task.ipxe
+	reboot
+fi
+
+echo ">>>>>>>>>>>>>>>>>>>>>>>" >> $hostlogdir/$host.log
+echo $(date) >> $hostlogdir/$host.log
+echo "finish" >> $hostlogdir/$host.log
+
+#$curl http://$master/admin/change_node_status/$host/installation
+#$curl http://$master/admin/change_task_status/$revision/installation
+
+#export BSDINSTALL_DISTDIR=/cluster/usr/src$revision/release/ftp/
+#if bsdinstall script /cluster/bsdinstall.input; then
+#	$curl http://$master/admin/change_node_status/$host/rebooting
+#	$curl http://$master/admin/change_task_status/$revision/done
+#	$curl http://$master/admin/change_boot/$host/hdd.ipxe
+	#reboot
+#else 
+#	$curl http://$master/admin/change_node_status/$host/rebooting
+#	$curl http://$master/admin/change_task_status/$revision/failed
+#	$curl http://$master/admin/change_boot/$host/take_task.ipxe
+		#reboot
+#fi
+
+$curl http://$master/admin/change_task_status/$revision/finish
+$curl http://$master/admin/change_node_status/$host/rebooting
+$curl http://$master/admin/change_boot/$host/take_task.ipxe
+reboot
+


More information about the svn-soc-all mailing list