p/fuel: Rebase, drop --depth=1 when cloning Fuel

`git clone --depth=1` does not preserve git history, so 3-way merge
is not possible.

There are 2 ways to fix this:
- (recurrent) rebase patches by adjusting patch context;
- (one-time, with a recurrent very small performance hit) preserve git
  history when cloning Fuel@OPNFV in salt.sh;

So, let's drop "--depth=1" and ensure `git am -3` will continue to work
on future patch context changes (where possbile).
While we're at it, also rebase our current patches.

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

diff --git a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
index 909b170..1b51d9d 100644 (file)
--- a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
+++ b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
@@ -11,11 +11,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index c876450..bb4f6cc 100755
+index 605da89..c44168e 100755
 --- a/mcp/scripts/salt.sh
 +++ b/mcp/scripts/salt.sh
-@@ -18,6 +18,10 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
-   ln -s /root/fuel/mcp/reclass /srv/salt/reclass
+@@ -23,6 +23,10 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
+   cd /root/fuel/mcp/patches && ./patch.sh patches.list reclass
 
    cd /srv/salt/scripts
 +  if [ "\$(uname -i)" = "aarch64" ]; then

diff --git a/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch b/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
index 6a25af9..d2c7ff0 100644 (file)
--- a/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
+++ b/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
@@ -6,17 +6,19 @@ FIXME: Revise the patching mechanism, make things more dynamic.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/scripts/salt.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ mcp/scripts/salt.sh | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index bb4f6cc..8bd3592 100755
+index c44168e..87f25a7 100755
 --- a/mcp/scripts/salt.sh
 +++ b/mcp/scripts/salt.sh
-@@ -15,6 +15,16 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
+@@ -14,7 +14,17 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
+   apt-get install -y git curl subversion
 
    svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
-   git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
+-  git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
++  git clone --recurse-submodules https://git.opnfv.org/fuel
 +  # NOTE(armband): no depth speedup on http
 +  git clone http://git.opnfv.org/armband
 +
@@ -29,4 +31,4 @@ index bb4f6cc..8bd3592 100755
 +    /root/armband/patches/reclass-system-salt-model/*.patch
    ln -s /root/fuel/mcp/reclass /srv/salt/reclass
 
-   cd /srv/salt/scripts
+   mkdir -p /usr/share/salt-formulas/reclass