Commit 18b1bc05 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbs -a: use gita add instead of direct ssh

parent bc85a420
......@@ -280,7 +280,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
TASKNUMBER=$($ETERBUILDBIN/gita $GIRARHOST get last task)
fi
else
NUMSPECS=$(estrlist count $LISTNAMES)
NUMSPECS=$(estrlist count $LISTNAMES)
# if more then one spec, use common task
if [ $NUMSPECS -gt 1 ] ; then
PREPARETASK=internal
......@@ -322,20 +322,10 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
# TODO: add check for repo (as in rpmgp) and run ginit if needed
docmd gpush $GIRARHOST $FORCE || fatal "gpush failed. It is possible you need run '\$ ginit $GIRARHOST' to create remote repo."
echo
ATASKNUMBER="$TASKNUMBER"
echo "Run build $PROJECTNAME at $GEARHOST"
# FIXME: tee hangup during first call with ssh ControlMaster
if [ -n "$PREPARETASK" ] ; then
# TODO: can we use showcmd?
showcmd $ETERBUILDBIN/gita $GIRARHOST get subtask $TASKNUMBER $PROJECTNAME
SUBTASK=$($ETERBUILDBIN/gita $GIRARHOST get subtask $TASKNUMBER $PROJECTNAME)
if [ -n "$SUBTASK" ] && ! echo "$TASKNUMBER" | grep -q " " ; then
info "$PROJECTNAME already present in the task $TASKNUMBER as subtask $SUBTASK, replacing"
docmd ssh $GEARHOST task delsub $TASKNUMBER $SUBTASK
# add task subtask - before subtask! (use next number?)
ATASKNUMBER="$TASKNUMBER $SUBTASK"
fi
docmd ssh $GEARHOST task add $ATASKNUMBER repo $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
docmd $ETERBUILDBIN/gita $GIRARHOST add $TASKNUMBER repo $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
else
docmd ssh $GEARHOST build $TESTONLY $(usearg -b $BINARYREPO sisyphus) $(usearg -p $POCKET) $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi
......
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