From 7f6210932a0a41a0097cb1c9be13b518f540c429 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 7 Feb 2017 10:53:23 +0100 Subject: submodules: Disable ignore=all for OPNFV projects Armband has a number of git submodules, which are hosted: - via Openstack (review.openstack.org, github.com); - via OPNFV (gerrit.opnfv.org); We cannot automatically detect changes in Openstack submodules, but within OPNFV, an "Updated submodule" commit is generated when a change is merged into the submodule git, provided we do not have an "ignore=all" git config directive. Ignoring submodule changes also prevents automatic ISO builds in Armband when Fuel@OPNFV changes are merged, which is something we needed during the D-release development cycle. The downside of removing "ignore" is that submodules are now seen as "modified" by git after apply our Armband patches. While at it, remove one fuel-library patch that got upstream, just to force a new ISO build. Change-Id: I8e81e781cb5c78c920a2a33cd8d584de3d9d4fd7 Signed-off-by: Alexandru Avadanii --- .gitmodules | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index f37e0c96..a8cfda34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,10 @@ path = upstream/fuel url = https://gerrit.opnfv.org/gerrit/fuel branch = master - ignore = all +[submodule "vswitchperf"] + path = upstream/vswitchperf + url = https://gerrit.opnfv.org/gerrit/vswitchperf.git + branch = master [submodule "fuel-plugin-opendaylight"] path = upstream/fuel-plugin-opendaylight url = https://github.com/openstack/fuel-plugin-opendaylight.git @@ -13,8 +16,3 @@ url = https://github.com/openstack/fuel-plugin-ovs branch = master ignore = all -[submodule "vswitchperf"] - path = upstream/vswitchperf - url = https://gerrit.opnfv.org/gerrit/vswitchperf.git - branch = master - ignore = all -- cgit 1.2.3-korg