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>

8 files changed, 18 insertions, 12 deletions

diff --git a/apex/build_utils.py b/apex/build_utils.py
index 213ae115..78467875 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 138166f0..2ad22ad5 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'
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 13bf6d89..d642533b 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -3,8 +3,8 @@ global_params:
   ha_enabled: true
   patches:
     undercloud:
-      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
-        project: openstack/tripleo-heat-templates
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 0b1aaa04..41b9ec72 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -3,8 +3,8 @@ global_params:
   ha_enabled: false
   patches:
     undercloud:
-      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
-        project: openstack/tripleo-heat-templates
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index f61e1a60..80b5b3b1 100644
--- a/config/deploy/os-odl-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -1,7 +1,10 @@
 ---
 global_params:
   ha_enabled: true
-
+  patches:
+    undercloud:
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
index 4bf90aa7..04dbaa89 100644
--- a/config/deploy/os-odl-bgpvpn-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -1,7 +1,10 @@
 ---
 global_params:
   ha_enabled: false
-
+  patches:
+    undercloud:
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index 53b3bcd4..a46b4849 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -3,8 +3,8 @@ global_params:
   ha_enabled: true
   patches:
     undercloud:
-      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
-        project: openstack/tripleo-heat-templates
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
     overcloud:
       - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
         project: openstack/puppet-tripleo
diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index e57d1d3c..609a03da 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -3,8 +3,8 @@ global_params:
   ha_enabled: false
   patches:
     undercloud:
-      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
-        project: openstack/tripleo-heat-templates
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
     overcloud:
       - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
         project: openstack/puppet-tripleo