git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f168b05
)
cleanup
author
Baris Metin
<bmetin@verivue.com>
Tue, 3 May 2011 21:51:37 +0000
(17:51 -0400)
committer
Baris Metin
<bmetin@verivue.com>
Tue, 3 May 2011 21:52:21 +0000
(17:52 -0400)
vbuild-nightly.sh
patch
|
blob
|
history
diff --git
a/vbuild-nightly.sh
b/vbuild-nightly.sh
index
71e6bd0
..
e66ea26
100755
(executable)
--- a/
vbuild-nightly.sh
+++ b/
vbuild-nightly.sh
@@
-11,6
+11,7
@@
DEFAULT_PERSONALITY=linux32
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build"
DEFAULT_IFNAME=eth0
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build"
DEFAULT_IFNAME=eth0
+DEFAULT_BUILD_BRANCH="master"
# default gpg path used in signing yum repo
DEFAULT_GPGPATH="/etc/planetlab"
# default gpg path used in signing yum repo
DEFAULT_GPGPATH="/etc/planetlab"
@@
-359,6
+360,7
@@
function show_env () {
echo PERSONALITY=$PERSONALITY
echo BASE=$BASE
echo BUILD_SCM_URL=$BUILD_SCM_URL
echo PERSONALITY=$PERSONALITY
echo BASE=$BASE
echo BUILD_SCM_URL=$BUILD_SCM_URL
+ echo BUILD_BRANCH=$BUILD_BRANCH
echo MAKEVARS="${MAKEVARS[@]}"
echo DRY_RUN="$DRY_RUN"
echo PLDISTROTAGS="$PLDISTROTAGS"
echo MAKEVARS="${MAKEVARS[@]}"
echo DRY_RUN="$DRY_RUN"
echo PLDISTROTAGS="$PLDISTROTAGS"
@@
-445,14
+447,11
@@
function main () {
PUBLISH_SRPMS=true
SSH_KEY=""
SIGNYUMREPO=""
PUBLISH_SRPMS=true
SSH_KEY=""
SIGNYUMREPO=""
- DEFULT_BUILD_BRANCH="master"
- BUILD_BRANCH=$DEFULT_BUILD_BRANCH
OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:w:W:r:M:yg:u:K:SBTnv7i:h" -l "build-branch:" -- $@)
if [ $? != 0 ]
then
usage
OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:w:W:r:M:yg:u:K:SBTnv7i:h" -l "build-branch:" -- $@)
if [ $? != 0 ]
then
usage
- echo "lala"
fi
eval set -- "$OPTS"
while true; do
fi
eval set -- "$OPTS"
while true; do
@@
-517,6
+516,7
@@
function main () {
[ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$BUILD_SCM_URL" ] && BUILD_SCM_URL="$DEFAULT_BUILD_SCM_URL"
[ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$BUILD_SCM_URL" ] && BUILD_SCM_URL="$DEFAULT_BUILD_SCM_URL"
+ [ -z "$BUILD_BRANCH" ] && BUILD_BRANCH="$DEFAULT_BUILD_BRANCH"
[ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER"
[ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER"