patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 11 Jul 2017 19:43:39 +0200
   3 Subject: [PATCH] salt.sh: Clone armband repo, apply patches from it
   4
   5 FIXME: Revise the patching mechanism, make things more dynamic.
   6
   7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   8 ---
   9  mcp/scripts/salt.sh | 12 +++++++++++-
  10  1 file changed, 11 insertions(+), 1 deletion(-)
  11
  12 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
  13 index c44168e..87f25a7 100755
  14 --- a/mcp/scripts/salt.sh
  15 +++ b/mcp/scripts/salt.sh
  16 @@ -14,7 +14,17 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
  17    apt-get install -y git curl subversion
  18
  19    svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
  20 -  git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
  21 +  git clone --recurse-submodules https://git.opnfv.org/fuel
  22 +  # NOTE(armband): no depth speedup on http
  23 +  git clone http://git.opnfv.org/armband
  24 +
  25 +  # For patch applying purposes (workaround for empty git config)
  26 +  export GIT_COMMITTER_NAME="OPNFV Armband"
  27 +  export GIT_COMMITTER_EMAIL="armband@enea.com"
  28 +  git -C /root/fuel am -3 --patch-format=mbox \
  29 +    /root/armband/patches/opnfv-fuel/*.patch
  30 +  git -C /root/fuel/mcp/reclass/classes/system am -3 --patch-format=mbox \
  31 +    /root/armband/patches/reclass-system-salt-model/*.patch
  32    ln -s /root/fuel/mcp/reclass /srv/salt/reclass
  33
  34    mkdir -p /usr/share/salt-formulas/reclass