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:
9ea5b98
)
tests module expected to be tagged and defined as TESTS_SVNPATH & can use module...
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 23 May 2008 11:28:55 +0000
(11:28 +0000)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 23 May 2008 11:28:55 +0000
(11:28 +0000)
Makefile
patch
|
blob
|
history
onelab-tags-4.2.mk
patch
|
blob
|
history
onelab-tags.mk
patch
|
blob
|
history
planetlab-tags-4.2.mk
patch
|
blob
|
history
planetlab-tags.mk
patch
|
blob
|
history
vbuild-nightly.sh
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
b6a8051
..
23b07e3
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-679,6
+679,11
@@
info: packages modules branches
.PHONY: info packages modules branches module-tools
.PHONY: info packages modules branches module-tools
+####################
+testsvnpath:
+ @$(if $(TESTS_SVNPATH), echo $(TESTS_SVNPATH) > $@, \
+ echo "http://svn.planet-lab.org/svn/tests/trunk" > $@)
+
####################
help:
@echo "********** Run make in two stages:"
####################
help:
@echo "********** Run make in two stages:"
diff --git
a/onelab-tags-4.2.mk
b/onelab-tags-4.2.mk
index
c0ee9b7
..
2cdb5c9
100644
(file)
--- a/
onelab-tags-4.2.mk
+++ b/
onelab-tags-4.2.mk
@@
-41,3
+41,5
@@
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-1
MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-1
MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
+# locating the right test directory - see make testsvnpath
+TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.2-4
diff --git
a/onelab-tags.mk
b/onelab-tags.mk
index
71485a4
..
d63f3b6
100644
(file)
--- a/
onelab-tags.mk
+++ b/
onelab-tags.mk
@@
-30,3
+30,5
@@
BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/trunk
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
+# locating the right test directory - see make testsvnpath
+TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/trunk
diff --git
a/planetlab-tags-4.2.mk
b/planetlab-tags-4.2.mk
index
431a6dc
..
75ca911
100644
(file)
--- a/
planetlab-tags-4.2.mk
+++ b/
planetlab-tags-4.2.mk
@@
-34,3
+34,5
@@
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-1
MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-1
MyPLC-SVNBRANCH := 4.2
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.2-15
+# locating the right test directory - see make testsvnpath
+TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.2-4
diff --git
a/planetlab-tags.mk
b/planetlab-tags.mk
index
8357f67
..
c3a2a07
100644
(file)
--- a/
planetlab-tags.mk
+++ b/
planetlab-tags.mk
@@
-28,3
+28,5
@@
BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/trunk
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk
MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
+# locating the right test directory - see make testsvnpath
+TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/trunk
diff --git
a/vbuild-nightly.sh
b/vbuild-nightly.sh
index
14720d6
..
dfd518d
100755
(executable)
--- a/
vbuild-nightly.sh
+++ b/
vbuild-nightly.sh
@@
-10,7
+10,7
@@
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_PERSONALITY=linux32
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
-DEFAULT_TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
+# TESTSVNPATH to be computed from the -tags.mk file - no default anymore
DEFAULT_TESTCONFIG="default"
DEFAULT_IFNAME=eth0
DEFAULT_TESTCONFIG="default"
DEFAULT_IFNAME=eth0
@@
-153,6
+153,8
@@
function build () {
make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
# actual stuff
make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
# actual stuff
make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
+ # store TESTSVNPATH
+ make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true testsvnpath
}
}
@@
-165,6
+167,17
@@
function runtest () {
echo -n "============================== Starting $COMMAND:runtest on $(date)"
echo -n "============================== Starting $COMMAND:runtest on $(date)"
+ # where to find TESTSVNPATH
+ stamp=/vserver/$BASE/build/testsvnpath
+ if [ ! -f $stamp ] ; then
+ echo "$COMMAND: Cannot figure TESTSVNPATH from missing $stamp"
+ failure
+ exit 1
+ fi
+ TESTSVNPATH=$(cat $stamp)
+ # use only this pat of the tests right now
+ TESTSVNPATH=${TESTSVNPATH}/system
+
### the URL to the RPMS/<arch> location
url=""
for a in i386 x86_64; do
### the URL to the RPMS/<arch> location
url=""
for a in i386 x86_64; do
@@
-245,7
+258,6
@@
function usage () {
echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk"
echo " -r tagsrelease - a release number that refers to PLDISTROTAGS - defaults to HEAD"
echo " -s svnpath - where to fetch the build module"
echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk"
echo " -r tagsrelease - a release number that refers to PLDISTROTAGS - defaults to HEAD"
echo " -s svnpath - where to fetch the build module"
- echo " -x testsvnpath - defaults to $DEFAULT_TESTSVNPATH"
echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
echo " -m mailto - no default"
echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
echo " -m mailto - no default"
@@
-278,7
+290,6
@@
function main () {
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
- x) TESTSVNPATH=$OPTARG ;;
c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
w) WEBPATH=$OPTARG ;;
m) MAILTO=$OPTARG ;;
c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
w) WEBPATH=$OPTARG ;;
m) MAILTO=$OPTARG ;;
@@
-310,7
+321,6
@@
function main () {
[ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
[ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
- [ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
[ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -n "$DRY_RUN" ] && MAILTO=""
[ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -n "$DRY_RUN" ] && MAILTO=""