diff options
| -rw-r--r-- | patches/fuel-web/0007-Increase-target-image-build-timeout.patch | 27 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch | 36 |
2 files changed, 36 insertions, 27 deletions
diff --git a/patches/fuel-web/0007-Increase-target-image-build-timeout.patch b/patches/fuel-web/0007-Increase-target-image-build-timeout.patch deleted file mode 100644 index 218f0339..00000000 --- a/patches/fuel-web/0007-Increase-target-image-build-timeout.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Stanislaw Kardach <kda@semihalf.com> -Date: Thu, 21 Apr 2016 15:36:27 -0700 -Subject: [PATCH] Increase target image build timeout - -Currently we're close to 40 minutes of image building (thanks to -qemu-debootstrap). If network connectivity is a bit slow (happened to -me) it's easy to go over 1h limit. Therefore let's push this to 2 hours -to be safer. - -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ---- - nailgun/nailgun/settings.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml -index 495a9c3..ac52141 100644 ---- a/nailgun/nailgun/settings.yaml -+++ b/nailgun/nailgun/settings.yaml -@@ -85,7 +85,7 @@ COLLECTOR_INST_INFO_URL: "https://{collector_server}/api/v1/installation_structu - COLLECTOR_OSWL_INFO_URL: "https://{collector_server}/api/v1/oswl_stats/" - COLLECTOR_PING_URL: "https://{collector_server}/api/v1/ping/" - --PROVISIONING_IMAGES_BUILD_TIMEOUT: 3600 -+PROVISIONING_IMAGES_BUILD_TIMEOUT: 7200 - PROVISIONING_IMAGES_PATH: "/var/www/nailgun/targetimages" - - REPO_PRIORITIES: diff --git a/patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch b/patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch new file mode 100644 index 00000000..2fbe680a --- /dev/null +++ b/patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch @@ -0,0 +1,36 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sat, 11 Jun 2016 21:37:29 +0200 +Subject: [PATCH] Nailgun: Increase target image build timeout + +Currently we're close to 40 minutes of image building (thanks to +qemu-debootstrap). If network connectivity is a bit slow (happened to +me) it's easy to go over 1h limit. Therefore let's push this to 2 hours +to be safer. + +[ Alexandru Avadanii ] +Moved original patch wrote by Stan to post-install. + +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh | 7 +++++++ + 1 file changed, 7 insertions(+) + +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 +index 7ceaacc..0435a28 100755 +--- 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 +@@ -45,6 +45,13 @@ if which dpkg > /dev/null 2>&1; then + # the maximum timeout value for mcagent has to be increased (use 2h). + sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \ + /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl ++ # Update nailgun timeout setting (2h) ++ if [ -f ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ]; then ++ sed -i.bak -r \ ++ 's/^(PROVISIONING_IMAGES_BUILD_TIMEOUT:)\s*[[:digit:]]+$/\1 7200/' \ ++ ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ++ echo "INFO: [1h] => [2h] updated nailgun image build timeout." ++ fi + + # Bootstrap: Use gzip instead of xz compression. + # |