Merge "transplant.py: Allow SSH on all interfaces."
[armband.git] / patches / opnfv-fuel / 0034-Nailgun-Increase-target-image-build-timeout.patch
1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Sat, 11 Jun 2016 21:37:29 +0200
3 Subject: [PATCH] Nailgun: Increase target image build timeout
4
5 Currently we're close to 40 minutes of image building (thanks to
6 qemu-debootstrap). If network connectivity is a bit slow (happened to
7 me) it's easy to go over 1h limit. Therefore let's push this to 2 hours
8 to be safer.
9
10 [ Alexandru Avadanii ]
11 Moved original patch wrote by Stan to post-install.
12
13 Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
14 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
15 ---
16  .../f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh  | 7 +++++++
17  1 file changed, 7 insertions(+)
18
19 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
20 index 7ceaacc..0435a28 100755
21 --- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
22 +++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
23 @@ -45,6 +45,13 @@ if which dpkg > /dev/null 2>&1; then
24      # the maximum timeout value for mcagent has to be increased (use 2h).
25      sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \
26        /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
27 +    # Update nailgun timeout setting (2h)
28 +    if [ -f ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ]; then
29 +      sed -i.bak -r \
30 +        's/^(PROVISIONING_IMAGES_BUILD_TIMEOUT:)\s*[[:digit:]]+$/\1 7200/' \
31 +        ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml
32 +      echo "INFO: [1h] => [2h] updated nailgun image build timeout."
33 +    fi
34  
35      # Bootstrap: Use gzip instead of xz compression.
36      #