u/fuel: Enable remote tracking

Always fetch the latest master branch for Fuel@OPNFV (the only git
submodule left), making constant rebase obsolete.

JIRA: ARMBAND-401

Change-Id: I3115e3a569fb18b3e7321aef51d7b0572c54249f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/.gitmodules b/.gitmodules
index 0a84688..44cc6d8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "opnfv-fuel"]
        path = upstream/fuel
        url = https://gerrit.opnfv.org/gerrit/fuel
-       branch = stable/euphrates
+       branch = master

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index a4a0ad5..5f85f9c 100644 (file)
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -17,7 +17,7 @@ F_PATCH_DIR := ${A_FUEL_BASE}/mcp/patches
 
 # 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.
-ARMBAND_TRACK_REMOTES ?=
+ARMBAND_TRACK_REMOTES ?= yes
 
 # for the patches applying purposes (empty git config in docker build container)
 export GIT_COMMITTER_NAME?=OPNFV Armband