Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
18b1bc05
Commit
18b1bc05
authored
Feb 19, 2020
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbs -a: use gita add instead of direct ssh
parent
bc85a420
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
12 deletions
+2
-12
rpmbs
bin/rpmbs
+2
-12
No files found.
bin/rpmbs
View file @
18b1bc05
...
@@ -280,7 +280,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
...
@@ -280,7 +280,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
TASKNUMBER
=
$(
$ETERBUILDBIN
/gita
$GIRARHOST
get last task
)
TASKNUMBER
=
$(
$ETERBUILDBIN
/gita
$GIRARHOST
get last task
)
fi
fi
else
else
NUMSPECS
=
$(
estrlist count
$LISTNAMES
)
NUMSPECS
=
$(
estrlist count
$LISTNAMES
)
# if more then one spec, use common task
# if more then one spec, use common task
if
[
$NUMSPECS
-gt
1
]
;
then
if
[
$NUMSPECS
-gt
1
]
;
then
PREPARETASK
=
internal
PREPARETASK
=
internal
...
@@ -322,20 +322,10 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
...
@@ -322,20 +322,10 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
# TODO: add check for repo (as in rpmgp) and run ginit if needed
# 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."
docmd gpush
$GIRARHOST
$FORCE
||
fatal
"gpush failed. It is possible you need run '
\$
ginit
$GIRARHOST
' to create remote repo."
echo
echo
ATASKNUMBER
=
"
$TASKNUMBER
"
echo
"Run build
$PROJECTNAME
at
$GEARHOST
"
echo
"Run build
$PROJECTNAME
at
$GEARHOST
"
# FIXME: tee hangup during first call with ssh ControlMaster
# FIXME: tee hangup during first call with ssh ControlMaster
if
[
-n
"
$PREPARETASK
"
]
;
then
if
[
-n
"
$PREPARETASK
"
]
;
then
# TODO: can we use showcmd?
docmd
$ETERBUILDBIN
/gita
$GIRARHOST
add
$TASKNUMBER
repo
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
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
else
else
docmd ssh
$GEARHOST
build
$TESTONLY
$(
usearg
-b
$BINARYREPO
sisyphus
)
$(
usearg
-p
$POCKET
)
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
docmd ssh
$GEARHOST
build
$TESTONLY
$(
usearg
-b
$BINARYREPO
sisyphus
)
$(
usearg
-p
$POCKET
)
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment