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