diff --git a/README.md b/README.md new file mode 100644 index 0000000..a78c429 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +build-scripts +============= + +mininet nightly build scripts diff --git a/nightly.sh b/nightly.sh index 5875b1b..e197b8e 100755 --- a/nightly.sh +++ b/nightly.sh @@ -17,6 +17,7 @@ opts='-z --timeout 1800' scripts=/home/mininet/build-scripts post=$scripts/post-build-result.sh check=$scripts/check-build-dir.sh +examples=$scripts/test-built-vm.sh maxbuilds=3 echo '* Pulling latest build.py' @@ -38,7 +39,7 @@ cd $dir # Build current master branch -dists="precise quantal raring saucy trusty" +dists="precise saucy trusty utopic" archs="32 64" for dist in $dists; do @@ -49,13 +50,15 @@ for dist in $dists; do builddir=mn-$target* echo "* Checking build log for $builddir" $post "check-$target" $check $builddir + echo "* Testing examples (quick)" + $post "test-examples-$target" $examples $date $target examplesquick done done # Build stable release release=2.1.0p2 -dists="raring" +dists="trusty" opts="$opts -b $release" for dist in $dists; do @@ -66,6 +69,8 @@ for dist in $dists; do builddir=mn-$release-$target* echo "* Checking build log for $builddir" $post "check-$release-$target" $check $builddir + echo "* Testing examples (quick)" + $post "test-examples-$release-$target" $examples $date $target examplesquick done done diff --git a/test-built-vm.sh b/test-built-vm.sh index d10b70d..50e455d 100755 --- a/test-built-vm.sh +++ b/test-built-vm.sh @@ -3,7 +3,7 @@ if [ $# -lt 2 ]; then echo "Mininet nightly build tester" echo "Usage: $0 [...]" - echo "Valid tests include: sanity core examplesquick examples ..." + echo "Valid tests include: sanity core examplesquick examplesfull ..." exit 1 fi @@ -27,8 +27,8 @@ if [ "$images" != "" ]; then fi build=~/mininet/util/vm/build.py -# was: --verbose -opts="" +# BL: was: "" - using verbose for now as we add this to nightly +opts="--verbose" branch="" #--branch master" @@ -37,7 +37,7 @@ for image in $images; do cmd="$build $opts $branch $tests --image $image" echo "- $cmd" $cmd - echo "* Done testing $image" + echo "* Done testing $image (exit code $?)" done exit 0