the tests module is now required to be a git module

diff --git a/Makefile b/Makefile
index 4a1c17b..17473fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -280,12 +280,12 @@ ALL.modules:=$(sort $(ALL.modules))
 
 # extract revision from -SVNPATH or tag from -GITPATH
 define stage1_module_vars
-ifeq "$($(1)-SVNPATH)" ""
+ifneq "$($(1)-SVNPATH)" ""
+$(1)-SVNPATH := $(strip $($(1)-SVNPATH))
+else
 $(1)-GITPATH := $(strip $($(1)-GITPATH))
 $(1).gitrepo := $(firstword $(subst @, ,$($(1)-GITPATH)))
 $(1).gittag := $(word 2,$(subst @, ,$($(1)-GITPATH)))
-else
-$(1)-SVNPATH := $(strip $($(1)-SVNPATH))
 endif
 endef
 
@@ -296,13 +296,16 @@ $(foreach module,$(ALL.modules), $(eval $(call stage1_module_vars,$(module))))
 # the heuristic is that we mention the date as part of the rpm release flag if
 # (*) the package has requested it by setting package-RPMDATE (container packages should do that)
 # (*) or SVNPATH contains 'trunk' or 'branches' 
+# (*) or GITPATH has no '@' (trunk) 
+# (*) or GITPATH contains a '@', and the gittag part has no '-' (this is to tell a tag from a branch..)
 # 
 define package_hasdate
 $(1).has-date = $(if $($(1)-RPMDATE),yes, \
                   $(if $($($(1).module)-SVNPATH), \
                     $(if $(findstring /trunk,$($($(1).module)-SVNPATH)),yes, \
                        $(if $(findstring /branches,$($($(1).module)-SVNPATH)),yes,)), \
-                    $(if $(findstring HEAD,$($($(1).module)-TAG)),yes,)))
+                    $(if $(not $($($(1).module).gittag)), yes,\
+                       $(if $(findstring -,$($($(1).module).gittag)),,yes))))
 endef
 
 $(foreach package, $(ALL), $(eval $(call package_hasdate,$(package))))
@@ -335,6 +338,7 @@ $($(1).specpath): header.spec $($(1).codespec)
        cat $($(1).codespec) >> $($(1).specpath)
 
 $($(1).codespec): $($(1).moduledir)
+
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_spec,$(package))))
@@ -344,12 +348,16 @@ define target_extract_module
 MODULES/$(1):
        @(echo -n "XXXXXXXXXXXXXXX -- BEG MODULE $(module) : $@ " ; date)
        mkdir -p MODULES
-       cd MODULES && $(if $($(1)-SVNPATH),\
+       cd MODULES && \
+       $(if $($(1)-SVNPATH),\
          svn export $($(1)-SVNPATH) $(1),\
          git clone $($(1).gitrepo) $(1); \
          $(if $($(1).gittag), cd $(1); git checkout "$($(1).gittag)"; cd -; ,) \
          rm -rf $(1)/.git )
        @(echo -n "XXXXXXXXXXXXXXX -- END MODULE $(module) : $@ " ; date)
+
+$(1)-module: MODULES/$(1)
+.PHONY: $(1)-module
 endef
 
 $(foreach module,$(ALL.modules),$(eval $(call target_extract_module,$(module))))
@@ -698,16 +706,16 @@ version-build:
 #################### 
 # for a given module
 VFORMAT="%30s := %s\n"
-define svn_version_target
-$(1)-version-svn:
+define print_tag_target
+$(1)-version-tag:
        @$(if $($(1)-SVNPATH),\
           printf $(VFORMAT) $(1)-SVNPATH "$($(1)-SVNPATH)",\
-          printf $(VFORMAT) $(1)-CVSROOT "$($(1)-CVSROOT)" ; printf $(VFORMAT) $(1)-TAG "$($(1)-TAG)")
+          printf $(VFORMAT) $(1)-GITPATH "$($(1)-GITPATH)" )
 endef
 
-$(foreach module,$(ALL.modules), $(eval $(call svn_version_target,$(module))))
+$(foreach module,$(ALL.modules), $(eval $(call print_tag_target,$(module))))
 
-version-svns: $(foreach module, $(ALL.modules), $(module)-version-svn)
+version-tags: $(foreach module, $(ALL.modules), $(module)-version-tag)
 
 RFORMAT="%20s :: version=%s release=%s\n"
 define rpm_version_target
@@ -718,8 +726,8 @@ endef
 
 $(foreach package,$(sort $(ALL)), $(eval $(call rpm_version_target,$(package))))
 
-versions: myplc-release version-build version-svns version-rpms
-.PHONY: versions version-build version-rpms version-svns
+versions: myplc-release version-build version-tags version-rpms
+.PHONY: versions version-build version-rpms version-tags
 
 #################### package info
 PKGKEYS := tarballs source srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
@@ -737,17 +745,21 @@ info-packages:
        @$(foreach package,$(ALL), echo package=$(package) ref_module=$($(package).module) modules=$($(package)-MODULES) rpmnames=$($(package).rpmnames); )
 
 info-modules:
-       @$(foreach module,$(ALL.modules), echo module=$(module) svnpath=$($(module)-SVNPATH); )
+       @$(foreach module,$(ALL.modules), echo module=$(module) \
+          $(if $($(module)-SVNPATH),svnpath=$($(module)-SVNPATH),gitpath=$($(module)-GITPATH)) ; )
 
 info-branches:
        @$(foreach module,$(ALL.modules), \
-         $(if $($(module)-SVNBRANCH),echo module=$(module) branch=$($(module)-SVNBRANCH);))
+         $(if $($(module)-BRANCH),echo module=$(module) branch=$($(module)-BRANCH);))
 
 module-tools:
        @$(foreach module,$(ALL.modules), \
-        $(if $($(module)-SVNPATH), \
-         $(if $($(module)-SVNBRANCH), \
-            echo $(module):$($(module)-SVNBRANCH); , \
+        $(if $($(module)-GITPATH), \
+         $(if $($(module)-BRANCH), \
+            echo git:$(module):$($(module)-BRANCH); , \
+            echo git:$(module); ), \
+         $(if $($(module)-BRANCH), \
+            echo $(module):$($(module)-BRANCH); , \
             echo $(module); )))
 
 info: info-packages info-modules info-branches 
@@ -755,9 +767,9 @@ info: info-packages info-modules info-branches
 .PHONY: info info-packages info-modules info-branches module-tools
 
 ####################
-tests_svnpath:
-       @$(if $(tests-SVNPATH), echo $(tests-SVNPATH) > $@, \
-       echo "http://svn.planet-lab.org/svn/tests/trunk" > $@)
+tests_gitpath:
+       @$(if $(tests-GITPATH), echo $(tests-GITPATH) > $@, \
+       echo "http://git.onelab.eu/tests.git" > $@)
 
 
 ####################

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index a7ef26d..5a66084 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -3,11 +3,11 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNBRANCH            := coblitz
+linux-2.6-BRANCH               := coblitz
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-42.coblitz
-madwifi-SVNBRANCH              := 0.9.4
+madwifi-BRANCH                 := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-util-vserver-SVNBRANCH         := scholz
+util-vserver-BRANCH            := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27
@@ -20,11 +20,11 @@ CoDemux-SVNPATH                     := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
-iptables-SVNBRANCH             := 1.3.8
+iptables-BRANCH                        := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
@@ -44,5 +44,5 @@ sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                  := http://git.onelab.eu/tests.git@tests-4.3-6

diff --git a/coblitz-stable-tags.mk b/coblitz-stable-tags.mk
index 738d1cb..4431116 100644 (file)
--- a/coblitz-stable-tags.mk
+++ b/coblitz-stable-tags.mk
@@ -3,11 +3,11 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNBRANCH            := coblitz
+linux-2.6-BRANCH               := coblitz
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-41.coblitz
-madwifi-SVNBRANCH              := 0.9.4
+madwifi-BRANCH                 := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-util-vserver-SVNBRANCH         := scholz
+util-vserver-BRANCH            := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27
@@ -20,11 +20,11 @@ CoDemux-SVNPATH                     := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
-iptables-SVNBRANCH             := 1.3.8
+iptables-BRANCH                        := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-9
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-12
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-35
@@ -44,5 +44,5 @@ sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                  := http://git.onelab.eu/tests.git@tests-4.3-6

diff --git a/f12-tags.mk b/f12-tags.mk
index 9a09e83..ab90864 100644 (file)
--- a/f12-tags.mk
+++ b/f12-tags.mk
@@ -3,9 +3,9 @@
 # $URL$
 #
 
-linux-2.6-SVNBRANCH            := f12
+linux-2.6-BRANCH               := f12
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/branches/f12@16162
-util-vserver-SVNBRANCH         := f12
+util-vserver-BRANCH            := f12
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/f12@16162
 yum-BRANCH                     := f12
 yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/f12@16162

diff --git a/module-tools.py b/module-tools.py
index d8f7d3a..787d757 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -1003,10 +1003,10 @@ will be based on latest tag %s and *not* on the current trunk"""%(self.name,bran
         command="svn copy --file %s %s %s"%(tmp,tag_url,new_tag_url)
         self.run_prompt("Create initial tag in trunk",command)
         os.unlink(tmp)
-        # print message about SVNBRANCH
+        # print message about BRANCH
         print """You might now wish to review your tags files
 Please make sure you mention as appropriate 
-%s-SVNBRANCH := %s""" %(self.name,branch_name)
+%s-BRANCH := %s""" %(self.name,branch_name)
 
 ##############################
 class Package:

diff --git a/modules.update b/modules.update
index 6a007f8..63806ff 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -12,4 +12,4 @@ fcdistro=centos5
   make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
   make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
   echo tests
-) | sort -u | grep -v '^build$'
+) | sort -u | grep -v '^build$' | grep -v 'git:'

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 1e5668e..422d31b 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -27,7 +27,7 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
@@ -54,8 +54,8 @@ BootstrapFS-SVNPATH           := http://svn.planet-lab.org/svn/BootstrapFS/tags/Bootstrap
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-4
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                   := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-5
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                   := http://git.onelab.eu/tests.git@tests-5.0-5
 
 ### temporary
 # nozomi not needed anymore for 2.6.27

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 8e07729..633f744 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -3,11 +3,11 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNBRANCH            := 22
+linux-2.6-BRANCH               := 22
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-48
-madwifi-SVNBRANCH              := 0.9.4
+madwifi-BRANCH                 := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-iptables-SVNBRANCH             := 1.3.8
+iptables-BRANCH                        := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###
@@ -16,7 +16,7 @@ nozomi-SVNPATH                        := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-SVNPATH   := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
 ###
-util-vserver-SVNBRANCH         := scholz
+util-vserver-BRANCH            := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 (trunk).
@@ -30,7 +30,7 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
@@ -55,7 +55,7 @@ BootCD-SVNPATH                        := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-2
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-5
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-4
-DistributedRateLimiting-SVNPATH                        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
+DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                   := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-5
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                   := http://git.onelab.eu/tests.git@tests-5.0-5

diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk
index 2e0b943..047bdc6 100644 (file)
--- a/planetbridge-tags.mk
+++ b/planetbridge-tags.mk
@@ -3,11 +3,11 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNBRANCH            := 22
+linux-2.6-BRANCH               := 22
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-39
-madwifi-SVNBRANCH              := 0.9.4
+madwifi-BRANCH         := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-util-vserver-SVNBRANCH         := scholz
+util-vserver-BRANCH            := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
@@ -20,11 +20,11 @@ CoDemux-SVNPATH                     := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-1
-iptables-SVNBRANCH             := 1.3.8
+iptables-BRANCH                := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
@@ -44,5 +44,5 @@ sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                   := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                   := http://git.onelab.eu/tests.git@tests-4.3-6

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index dd27506..6a882fa 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -26,7 +26,7 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
@@ -53,5 +53,5 @@ BootstrapFS-SVNPATH           := http://svn.planet-lab.org/svn/BootstrapFS/tags/Bootstrap
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-4
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/trunk
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                  := http://git.onelab.eu/tests.git

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 0225f81..8ecc392 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -27,7 +27,7 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
@@ -54,5 +54,5 @@ BootstrapFS-SVNPATH           := http://svn.planet-lab.org/svn/BootstrapFS/tags/Bootstrap
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-4
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-5
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                  := http://git.onelab.eu/tests.git@tests-5.0-5

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index b634ef0..cc95d85 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -3,14 +3,14 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNBRANCH            := 22
+linux-2.6-BRANCH               := 22
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-48
-madwifi-SVNBRANCH              := 0.9.4
+madwifi-BRANCH         := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-iptables-SVNBRANCH             := 1.3.8
+iptables-BRANCH                := 1.3.8
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
-util-vserver-SVNBRANCH         := scholz
+util-vserver-BRANCH            := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-29
@@ -24,7 +24,7 @@ fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tag
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
@@ -51,5 +51,5 @@ BootstrapFS-SVNPATH           := http://svn.planet-lab.org/svn/BootstrapFS/tags/Bootstrap
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-4
 DistributedRateLimiting-SVNPATH                        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/trunk
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                  := http://git.onelab.eu/tests.git

diff --git a/trellis-tags.mk b/trellis-tags.mk
index b78b82e..0337546 100644 (file)
--- a/trellis-tags.mk
+++ b/trellis-tags.mk
@@ -9,10 +9,10 @@
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
 # Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
-util-vserver-SVNBRANCH         := trellis
+util-vserver-BRANCH            := trellis
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/trellis
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNBRANCH      := trellis
+util-vserver-pl-BRANCH := trellis
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
@@ -29,7 +29,7 @@ Mom-SVNPATH                   := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH                 := 0.9
+vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH            := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
@@ -49,5 +49,5 @@ sfa-SVNPATH                     := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.
 pyopenssl-SVNPATH               := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 PLCRT-SVNPATH                   := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
 
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH                   := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH                   := http://git.onelab.eu/tests.git@tests-4.3-6

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index f8ba234..76b42fb 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -212,8 +212,8 @@ function build () {
 
     # stage1
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
-    # store tests_svnpath
-    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_svnpath
+    # store tests_gitpath
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_gitpath
     # versions
     make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
     # actual stuff
@@ -230,16 +230,14 @@ function run_log () {
 
     echo "============================== BEG $COMMAND:run_log on $(date)"
 
-    # where to find TESTS_SVNPATH
-    stamp=/vservers/$BASE/build/tests_svnpath
+    # where to find TESTS_GITPATH
+    stamp=/vservers/$BASE/build/tests_gitpath
     if [ ! -f $stamp ] ; then
-       echo "$COMMAND: Cannot figure TESTS_SVNPATH from missing $stamp"
+       echo "$COMMAND: Cannot figure TESTS_GITPATH from missing $stamp"
        failure
        exit 1
     fi
-    TESTS_SVNPATH=$(cat $stamp)
-    # don't need the tests fulltree anymore
-    TESTS_SYSTEM_SVNPATH=${TESTS_SVNPATH}/system
+    TESTS_GITPATH=$(cat $stamp)
 
     ### the URL to the RPMS/<arch> location
     # f12 now has everything in i686; try i386 first as older fedoras have both
@@ -265,11 +263,15 @@ function run_log () {
     # test directory name on test box
     testdir=${BASE}
     # clean it
-    ssh -n ${testmaster_ssh} rm -rf ${testdir}
-    # check it out 
-    ssh -n ${testmaster_ssh} svn co ${TESTS_SYSTEM_SVNPATH} ${testdir}
-###    # check out the entire tests/ module (with system/ duplicated) as a subdir - see fulltree above
-###    ssh -n ${testmaster_ssh} svn co ${TESTS_SVNPATH} ${testdir}/tests
+    ssh -n ${testmaster_ssh} rm -rf ${testdir} ${testdir}.git
+
+    # check it out - just the 'system' subdir is enough
+    gitrepo=$(echo $TESTS_GITPATH | cut -d@ -f1)
+    gittag=$(echo $TESTS_GITPATH | cut -s -d@ -f2)
+    ssh -n ${testmaster_ssh} git clone ${gitrepo} ${testdir}.git 
+    [ -n "$gittag" ] && ssh -n ${testmaster_ssh} "cd ${testdir}.git ; git checkout ${gittag}"
+    ssh -n ${testmaster_ssh} "mv ${testdir}.git/system ${testdir} ; rm -rf ${testdir}.git"
+
     # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
     configs=""
     for config in ${TESTCONFIG} ; do
@@ -435,8 +437,6 @@ function main () {
 
     set -e
 
-    echo "==================== MAIN BEG $(date)"
-
     # parse arguments
     MAKEVARS=()
     MAKETARGETS=()
@@ -568,7 +568,7 @@ function main () {
            [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY}
            vserver ${BASE} exec svn update /build
            # make sure we refresh the tests place in case it has changed
-           rm -f /build/tests_svnpath
+           rm -f /build/tests_gitpath
            # get environment from the first run 
            FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
            # retrieve all in one run