From e5632e76af93e02dc3221581e41741ccb36d248a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 Nov 2016 17:30:18 +0100 Subject: build/f_repos: Fix remote tracking, pin N HEADs Fix two issues that went undetected until now: - remote tracking variable does not properly evaluate in CI, since there is no HEAD reference; - git submodules references still point to master branch(es) commits, although .gitmodules configure the remote tracked branch correctly; JIRA: FUEL-234 Change-Id: I96dc704e2cfe98f2e93d5fa7d7dd261e7f151238 Signed-off-by: Alexandru Avadanii --- build/f_repos/Makefile | 3 +-- build/f_repos/sub/fuel-agent | 2 +- build/f_repos/sub/fuel-astute | 2 +- build/f_repos/sub/fuel-library | 2 +- build/f_repos/sub/fuel-main | 2 +- build/f_repos/sub/fuel-menu | 2 +- build/f_repos/sub/fuel-nailgun-agent | 2 +- build/f_repos/sub/fuel-ostf | 2 +- build/f_repos/sub/fuel-ui | 2 +- build/f_repos/sub/fuel-web | 2 +- build/f_repos/sub/python-fuelclient | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) (limited to 'build') diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile index b5eafff9b..be6f82909 100644 --- a/build/f_repos/Makefile +++ b/build/f_repos/Makefile @@ -34,8 +34,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 -FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable) +FUEL_TRACK_REMOTES ?= yes .PHONY: all all: release diff --git a/build/f_repos/sub/fuel-agent b/build/f_repos/sub/fuel-agent index 075fc9e25..7d35078a9 160000 --- a/build/f_repos/sub/fuel-agent +++ b/build/f_repos/sub/fuel-agent @@ -1 +1 @@ -Subproject commit 075fc9e2572330416ec0aad45bce969baa43b4f3 +Subproject commit 7d35078a9d67a9015f49f5813dbad225837095a4 diff --git a/build/f_repos/sub/fuel-astute b/build/f_repos/sub/fuel-astute index bca595a96..87ba44dcd 160000 --- a/build/f_repos/sub/fuel-astute +++ b/build/f_repos/sub/fuel-astute @@ -1 +1 @@ -Subproject commit bca595a964e4f45798f393bb0bbc685605cae090 +Subproject commit 87ba44dcde92a0bfe50fdba6e0a2f271e6859919 diff --git a/build/f_repos/sub/fuel-library b/build/f_repos/sub/fuel-library index 2cd11d3a5..0281ca8ee 160000 --- a/build/f_repos/sub/fuel-library +++ b/build/f_repos/sub/fuel-library @@ -1 +1 @@ -Subproject commit 2cd11d3a506f9039b7bfd2f3b720df7f1244df9b +Subproject commit 0281ca8ee1900271252edc5e6e1ceb2112cfd0da diff --git a/build/f_repos/sub/fuel-main b/build/f_repos/sub/fuel-main index 70749a245..a0f955fc5 160000 --- a/build/f_repos/sub/fuel-main +++ b/build/f_repos/sub/fuel-main @@ -1 +1 @@ -Subproject commit 70749a24518b98e1162d60abdcd2c25c9ffa92ee +Subproject commit a0f955fc5bff09c02d538ae2c9a7373b6ee511ed diff --git a/build/f_repos/sub/fuel-menu b/build/f_repos/sub/fuel-menu index 1a94d657e..9aedc10ff 160000 --- a/build/f_repos/sub/fuel-menu +++ b/build/f_repos/sub/fuel-menu @@ -1 +1 @@ -Subproject commit 1a94d657ecaca4a1b549141ee22e5bc7ca20822e +Subproject commit 9aedc10ffea536d7d353cb5869c492a1729a98f2 diff --git a/build/f_repos/sub/fuel-nailgun-agent b/build/f_repos/sub/fuel-nailgun-agent index af1e5da09..0cfe06be9 160000 --- a/build/f_repos/sub/fuel-nailgun-agent +++ b/build/f_repos/sub/fuel-nailgun-agent @@ -1 +1 @@ -Subproject commit af1e5da094c2975230da29f808b26645231841d4 +Subproject commit 0cfe06be939f92c3a8158a0e8a96a7ab8cf5403b diff --git a/build/f_repos/sub/fuel-ostf b/build/f_repos/sub/fuel-ostf index ddd691205..132f287fb 160000 --- a/build/f_repos/sub/fuel-ostf +++ b/build/f_repos/sub/fuel-ostf @@ -1 +1 @@ -Subproject commit ddd691205d7dccfc9a9b52cc2681cdb367c82d2a +Subproject commit 132f287fb769276cde63ac283222d5447bc68308 diff --git a/build/f_repos/sub/fuel-ui b/build/f_repos/sub/fuel-ui index 2a22c985e..5b66f907e 160000 --- a/build/f_repos/sub/fuel-ui +++ b/build/f_repos/sub/fuel-ui @@ -1 +1 @@ -Subproject commit 2a22c985eeeb3adf2a18f3f56abdcc841caab252 +Subproject commit 5b66f907e628ba16d03a3fd3f259099b727a5fa2 diff --git a/build/f_repos/sub/fuel-web b/build/f_repos/sub/fuel-web index 118b9231a..d04c1108b 160000 --- a/build/f_repos/sub/fuel-web +++ b/build/f_repos/sub/fuel-web @@ -1 +1 @@ -Subproject commit 118b9231a48f9341d72990ab3cc65f375d2423c9 +Subproject commit d04c1108b2b19e5d681a07fd3492b93d133c4617 diff --git a/build/f_repos/sub/python-fuelclient b/build/f_repos/sub/python-fuelclient index 870261942..8ac48ac48 160000 --- a/build/f_repos/sub/python-fuelclient +++ b/build/f_repos/sub/python-fuelclient @@ -1 +1 @@ -Subproject commit 870261942796f367ec046341ba095f7ac518f40c +Subproject commit 8ac48ac48facc47923ba00c09bf96080ca88d31c -- cgit 1.2.3-korg