summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-08-07 11:50:37 -0400
committerTim Rozet <trozet@redhat.com>2018-08-08 11:05:58 -0400
commitbeafc8f4ede72ddb1d2abc2eaff14f9c954bf3fd (patch)
tree52d9ae41b41b5660df337db1f31bc8e61ed98d88 /apex
parent5b4de29a689ec1a38e44f9b3d1d82c3084629392 (diff)
Bump deploy timeout
We are seeing queens baremetal deployments are all failing in step 5 due to timeout. Not sure why the sudden increase in deployment time, but we can try increasing the deploy timeout to see if it fixes it. Also includes a revert for a commit that broke OOO master: https://bugs.launchpad.net/tripleo/+bug/1785872 Change-Id: I0bcfd5b3ca49b176f901c13b8b432fa29c899188 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/build_utils.py2
-rw-r--r--apex/common/constants.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/build_utils.py b/apex/build_utils.py
index 213ae11..7846787 100644
--- a/apex/build_utils.py
+++ b/apex/build_utils.py
@@ -86,7 +86,7 @@ def clone_fork(args):
logging.info('Checked out commit:\n{}'.format(ws.head.commit.message))
-def strip_patch_sections(patch, sections=['releasenotes']):
+def strip_patch_sections(patch, sections=['releasenotes', 'tests']):
"""
Removes patch sections from a diff which contain a file path
:param patch: patch to strip
diff --git a/apex/common/constants.py b/apex/common/constants.py
index 138166f..2ad22ad 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -51,7 +51,7 @@ PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
'/puppet-opendaylight'
DEBUG_OVERCLOUD_PW = 'opnfvapex'
NET_ENV_FILE = 'network-environment.yaml'
-DEPLOY_TIMEOUT = 90
+DEPLOY_TIMEOUT = 120
UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \
'-tripleo-rdo/'
OPENSTACK_GERRIT = 'https://review.openstack.org'