Commits

Anonymous committed 9e09d03

Make upload script print size of files being uploaded

Comments (0)

Files changed (3)

slave/etc/rc.d/rc.vlbuildslave

 # NORMAL RC SCRIPT OPERATIONS FOR CONTROLLING THE SLAVE INSTANCE
 function slave_start {
 	# We need to create a lock file here
+	if [ -f $LOCKFILE ]; then
+		(cd $SLAVEPATH
+			buildbot stop
+		)
+		rm -rf $LOCKFILE
+	fi
 	( cd $SLAVEPATH
 	buildslave start
 	)

slave/usr/local/bin/build-pusher

 			name=$(pkgname $pkg)
 			version=$(pkgversion $pkg)
 			pkgnam=$name
+			# Print file size for upload
+			du -sh $pkg
 			case "pkgnam" in
 				kernel|kernel-src|kernel-modules|kernel-src-stripped)
 					kver=$(echo $BUILDER | cut -f 2 -d "-")

updated/update.conf

 #    an update to the slaves.  the function name MUST remain the same and the so must 
 #    everythin else.  The rest of the update system looks for this function.
 
-REMOTEVERSION=20131204f
+REMOTEVERSION=20131217
 CONF=/etc/vlbuildslave/slavehost.conf
 BKCONF=/etc/vlbuildslave/slavehost.conf.backup
 LOGFILE=/var/log/vlbuildbot-updated.log
 
 
 # remove the lock file when we are done
-rm -rf /tmp/vlbuildbot-updating.lock
+#rm -rf /tmp/vlbuildbot-updating.lock
 
 }
 
 }
 
 function update_slave() {
-# This is the only function called by the update agent. 
-if [ ! -d $JAILS/VL-7.1-BB-FINAL ]; then
-	update_jails
-fi
-# Change the REPO words in the rc file
-sed -i 's|\bREPO\b|BOTREPO|g' /etc/rc.d/rc.vlbuildslave
-rm /tmp/vlbuildbot-updating.lock
-/etc/rc.d/rc.vlbuildslave stop
-#rm /tmp/vlbuildbot-updating.lock
-/etc/rc.d/rc.vlbuildslave start
+
+update_slave_tools
+echo "Installing updated bot rc script"
+cp $BOTREPO/slave/etc/rc.d/rc.vlbuildslave /etc/rc.d/rc.vlbuildslave
+
+# Remove the lockfile after we are done updating
+rm -rf /tmp/vlbuildbot-updating.lock
 
 }