Commit 9ff17256 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbs: add pocket build support (-p option)

parent a42e3083
...@@ -27,7 +27,8 @@ NOSOURCE= ...@@ -27,7 +27,8 @@ NOSOURCE=
NOCHECK= NOCHECK=
UPDATES= UPDATES=
DELETENOW= DELETENOW=
POCKET=
TASKNUMBER=
############################# #############################
Usage="Usage: $name [-s -u -c -n --nodeps] [spec or src.rpm]..." Usage="Usage: $name [-s -u -c -n --nodeps] [spec or src.rpm]..."
...@@ -43,6 +44,7 @@ phelp() ...@@ -43,6 +44,7 @@ phelp()
echog "Options:" echog "Options:"
echog " -u - sign and run gear build task after build" echog " -u - sign and run gear build task after build"
echog " -a TASK - sign package(s)/repo, push/upload it and add to (shared) task TASK" echog " -a TASK - sign package(s)/repo, push/upload it and add to (shared) task TASK"
echog " -p POCKET - build package in POCKET (supported on git.etersoft.ru)"
echog " -l - lazy cleanup (clean before build, not after)" echog " -l - lazy cleanup (clean before build, not after)"
echog "Ext. options:" echog "Ext. options:"
echog " -c - only sign package(s) with checking" echog " -c - only sign package(s) with checking"
...@@ -55,7 +57,7 @@ phelp() ...@@ -55,7 +57,7 @@ phelp()
# echog " -d - remove package(s) from SRPMS and Incoming" # echog " -d - remove package(s) from SRPMS and Incoming"
} }
while getopts :hfscuUdnoa:z opt; do while getopts :hfscuUdnop:a:z opt; do
case $opt in case $opt in
h) phelp; exit 0;; h) phelp; exit 0;;
s) SIGN=1 ;; s) SIGN=1 ;;
...@@ -67,6 +69,7 @@ while getopts :hfscuUdnoa:z opt; do ...@@ -67,6 +69,7 @@ while getopts :hfscuUdnoa:z opt; do
a) UPLOADNOW=1 ; SIGN=1 ; TASKNUMBER=$OPTARG ;; a) UPLOADNOW=1 ; SIGN=1 ; TASKNUMBER=$OPTARG ;;
n) NOCHECK=1; ;; n) NOCHECK=1; ;;
o) NOSOURCE=1; ;; o) NOSOURCE=1; ;;
p) UPLOADNOW=1 ; SIGN=1 ; POCKET=$OPTARG ;;
z) export USE_LEGACY_COMPRESSION=1; z) export USE_LEGACY_COMPRESSION=1;
;; ;;
d) DELETENOW=1 ;; d) DELETENOW=1 ;;
...@@ -196,7 +199,8 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -196,7 +199,8 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
if [ -n "$TASKNUMBER" ] ; then if [ -n "$TASKNUMBER" ] ; then
ssh $GIRARHOST task add $TASKNUMBER repo $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp ssh $GIRARHOST task add $TASKNUMBER repo $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
else else
ssh $GIRARHOST build -b $BINARYREPO $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp [ -n "$POCKET" ] && POCKETARG="-p $POCKET" || POCKETARG=""
ssh $GIRARHOST build -b $BINARYREPO $POCKETARG $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi fi
# FIXME: incorporate # FIXME: incorporate
cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
......
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