From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 2 Apr 2014 08:24:37 +0000 (+0200)
Subject: the latest tests require sfa from branch
X-Git-Tag: 5.3.4~8
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=e12dfd64463d47b6f8957f00d6179e9d4e120eb7

the latest tests require sfa from branch
---

diff --git a/lxc-tags.mk b/lxc-tags.mk
index b0c14560..d9c60114 100644
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -50,6 +50,6 @@ myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.3-
 
 #
 sfa-BRANCH			:= geni-v3
-sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@geni-v3
 #
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master
diff --git a/onelab-tags.mk b/onelab-tags.mk
index ae3f5207..c5e52527 100644
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -52,8 +52,7 @@ DistributedRateLimiting-SVNPATH	:= http://svn.planet-lab.org/svn/DistributedRate
 
 #
 sfa-BRANCH			:= geni-v3
-sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
-#sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@geni-v3
 #
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master
diff --git a/onelab.mk b/onelab.mk
index 851ae3b5..cfbbe728 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -576,13 +576,6 @@ release-RPMDATE := yes
 ALL += release
 
 ##############################
-# sfa requires python-2.7
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
 #
 # sfa - Slice Facility Architecture
 #
@@ -590,22 +583,3 @@ sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
 
-#sface-MODULES := sface
-#sface-SPEC := sface.spec
-#ALL += sface
-endif
-
-##############################
-# don't build these by default, we have separate builds for that
-# corresponding tags are removed from onelab-tags.mk as well
-# as this is not supported on f14 anymore
-# and we target debians and ubuntus anyway
-myslice-MODULES := myslice
-myslice-SPEC := myslice.spec
-myslice-STOCK-DEVEL-RPMS := python-django
-myslice-STOCK-DEVEL-DEBS := python-django python-django-south
-#ALL += myslice
-
-manifold-MODULES := manifold
-manifold-SPEC := manifold.spec
-#ALL += manifold