Commit 44b64a0a authored by Vitaly Lipatov's avatar Vitaly Lipatov

print only task info to log, do step

parent 88e775f8
...@@ -188,8 +188,8 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -188,8 +188,8 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
ssh $GIRARHOST build -b $BINARYREPO $BASENAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp ssh $GIRARHOST build -b $BINARYREPO $BASENAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi fi
# FIXME: incorporate # FIXME: incorporate
cat $RPMDIR/uploaded.log.tmp | head -n2 | tail -n1 >> $RPMDIR/uploaded.log cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
echo "run $TASKNUMBER task $BASENAME with tag $TAG at $GIRARHOST (in $BINARYREPO) at `date "+%c"`" >>$RPMDIR/uploaded.log echo " run $TASKNUMBER task $BASENAME with tag $TAG at $GIRARHOST (in $BINARYREPO) at `date "+%c"`" >>$RPMDIR/uploaded.log
rm -f $RPMDIR/uploaded.log.tmp rm -f $RPMDIR/uploaded.log.tmp
exit exit
fi fi
...@@ -301,7 +301,7 @@ else ...@@ -301,7 +301,7 @@ else
fi fi
# FIXME: parse and incorporate # FIXME: parse and incorporate
cat $RPMDIR/uploaded.log.tmp | head -n2 | tail -n1 >> $RPMDIR/uploaded.log cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
for i in $LISTBUILT ; do for i in $LISTBUILT ; do
# FIXME: more general way # FIXME: more general way
...@@ -309,8 +309,8 @@ for i in $LISTBUILT ; do ...@@ -309,8 +309,8 @@ for i in $LISTBUILT ; do
echo >>$LOGFILE echo >>$LOGFILE
date >>$LOGFILE date >>$LOGFILE
echo "uploaded">>$LOGFILE echo "uploaded">>$LOGFILE
TEXTADD="run $TASKNUMBER build src.rpm" TEXTADD=" run $TASKNUMBER build src.rpm"
[ -z "$TASKNUMBER" ] || TEXTADD="add src.rpm to task $TASKNUMBER" [ -z "$TASKNUMBER" ] || TEXTADD=" add src.rpm to task $TASKNUMBER"
echo "$(basename $i) $TEXTADD at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log echo "$(basename $i) $TEXTADD at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment