simpler

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 60e20c9..3f2f9be 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -29,7 +29,8 @@ reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32
 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f12 -p linux32 -b @DATE@--f12-32-sfasl sfa-GITPATH=git://git.f-lab.fr/sfa.git@senslab
 
 # f14 - needs 2.6.32
 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f12 -p linux32 -b @DATE@--f12-32-sfasl sfa-GITPATH=git://git.f-lab.fr/sfa.git@senslab
 
 # f14 - needs 2.6.32

-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64 -c triangle -c sfamesh
+#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64 -c triangle -c sfamesh
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64

 velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32-testtag tests-GITPATH=git://git.onelab.eu/tests.git@tests-5.0-29
 
 # wextoolbox on f14 (gnuradio is in f14 only)
 velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu   -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32-testtag tests-GITPATH=git://git.onelab.eu/tests.git@tests-5.0-29
 
 # wextoolbox on f14 (gnuradio is in f14 only)

diff --git a/scripts/flab-sync.sh b/scripts/flab-sync.sh
index 05f23af..b119095 100755 (executable)
--- a/scripts/flab-sync.sh
+++ b/scripts/flab-sync.sh
@@ -12,7 +12,6 @@ COMMAND=$(basename $0)
 DEFAULT_WORKDIR=/Users/parmentelat/git/sfa-flab-sync
 UPSTREAMREPO=ssh://thierry@git.onelab.eu/git/sfa.git
 FLABREPO=ssh://thierry@git.f-lab.fr/git/sfa.git
 DEFAULT_WORKDIR=/Users/parmentelat/git/sfa-flab-sync
 UPSTREAMREPO=ssh://thierry@git.onelab.eu/git/sfa.git
 FLABREPO=ssh://thierry@git.f-lab.fr/git/sfa.git

-TOTRACK="generic senslab"

 AGAINST=master
 
 GIT_OPTIONS=""
 AGAINST=master
 
 GIT_OPTIONS=""


@@ -67,13 +66,15 @@ function merge_master_in_local_branches () {
     run git checkout master
     msg pulling master from upstream/onelab
     run git pull $GIT_OPTIONS $UPSTREAMREPO refs/heads/master:refs/heads/master
     run git checkout master
     msg pulling master from upstream/onelab
     run git pull $GIT_OPTIONS $UPSTREAMREPO refs/heads/master:refs/heads/master

-    msg pushing master to flab
-    run git push $GIT_OPTIONS $FLABREPO refs/heads/master:refs/heads/master
+    if [ -n "$PUSH_MASTER" ] ; then
+       msg pushing master to flab
+       run git push $GIT_OPTIONS $FLABREPO refs/heads/master:refs/heads/master
+    fi

 
     [ -n "$MASTER_ONLY" ] && return
 
     # manage our branches: merge master into generic and generic into senslab
 
     [ -n "$MASTER_ONLY" ] && return
 
     # manage our branches: merge master into generic and generic into senslab

-    for merge in master:generic generic:senslab; do
+    for merge in master:generic master:senslab2; do

        what=$(echo $merge | cut -d: -f1)
        where=$(echo $merge | cut -d: -f2)
        runcd $WORKDIR
        what=$(echo $merge | cut -d: -f1)
        where=$(echo $merge | cut -d: -f2)
        runcd $WORKDIR


@@ -87,8 +88,10 @@ function merge_master_in_local_branches () {
        msg locally merging $what in $where
        run git merge $GIT_OPTIONS $what
         # push back
        msg locally merging $what in $where
        run git merge $GIT_OPTIONS $what
         # push back

-       msg pushing back $where onto flab
-       run git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where
+       msg Avoiding the push back for now, run manually if needed
+       msg git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where
+       #msg pushing back $where onto flab
+       #run git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where

     done
 }
 
     done
 }
 


@@ -99,18 +102,21 @@ function usage () {
     echo "         please use a *dedicated* space"
     echo " -r : restart from a fresh workdir"
     echo " -m : master only"
     echo "         please use a *dedicated* space"
     echo " -r : restart from a fresh workdir"
     echo " -m : master only"

+    echo " -s : skip master push"

     echo " -i : interactive"
     echo " -n : dry-run"
     echo " -v : verbose"
     exit 1
 }
 
     echo " -i : interactive"
     echo " -n : dry-run"
     echo " -v : verbose"
     exit 1
 }
 

+PUSH_MASTER=true

 function main () {
 function main () {

-    while getopts "d:rminv" opt; do
+    while getopts "d:rmsinv" opt; do

        case $opt in 
            d) WORKDIR=$OPTARG; shift ;;
            r) RESTART_FROM_SCRATCH=true ;;
            m) MASTER_ONLY=true ;;
        case $opt in 
            d) WORKDIR=$OPTARG; shift ;;
            r) RESTART_FROM_SCRATCH=true ;;
            m) MASTER_ONLY=true ;;

+           s) PUSH_MASTER=;;

            i) INTERACTIVE=true ;;
            n) GIT_OPTIONS="$GIT_OPTIONS -n" ;;
            v) set -x ; GIT_OPTIONS="$GIT_OPTIONS -v" ;;
            i) INTERACTIVE=true ;;
            n) GIT_OPTIONS="$GIT_OPTIONS -n" ;;
            v) set -x ; GIT_OPTIONS="$GIT_OPTIONS -v" ;;