Turn on remote tracking of submodules

JIRA: FUEL-234
Change-Id: I916cc94f58df2f2227384c73eda556f448ac50b5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/.gitmodules b/.gitmodules
index 290b742..4d35439 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -51,7 +51,7 @@
 [submodule "network-checker"]
        path = build/f_repos/sub/network-checker
        url = https://github.com/openstack/network-checker.git
-       branch = master
+       branch = stable/newton
         ignore = all
 [submodule "fuel-ui"]
        path = build/f_repos/sub/fuel-ui

diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index f09dbed..b5eafff 100644 (file)
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -35,9 +35,7 @@ include ../config.mk
 # To enable remote tracking, set the following var to any non-empty string.
 # Leaving this var empty will bind each git submodule to its saved commit.
 # NOTE: For non-stable branches, unless overriden, always track remotes
-# Need to disable this logic temporarily as Newton doesn't seem to have stable
-# branches in all repos. /Stefan
-# FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
+FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
 
 .PHONY: all
 all: release