Merge "Revert "Add multithreading while installing salt-minions" PROD-37096"
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
index db375e6..7086240 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
@@ -51,7 +51,7 @@
def ubuntu_vcp_image_name = "ubuntu-vcp-2019.2.0"
def ubuntu_foundation_image_name = "ubuntu-16.04-foundation-2019.2.0"
-timeout(time: 2, unit: 'HOURS') {
+timeout(time: 3, unit: 'HOURS') {
timestamps {
node ("${PARENT_NODE_NAME}") {
if (! fileExists("${PARENT_WORKSPACE}")) {
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index 0b4b698..7f2df1d 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -451,7 +451,7 @@
'export JENKINS_USER={user}\n'
'export JENKINS_PASS={password}\n'
'export JENKINS_START_TIMEOUT=60\n'
- 'export JENKINS_BUILD_TIMEOUT=1800\n'
+ 'export JENKINS_BUILD_TIMEOUT=2400\n'
'echo "export JENKINS_URL=${{JENKINS_URL}}'
' # Jenkins API URL"\n'
'echo "export JENKINS_USER=${{JENKINS_USER}}'