commit cdb3cbf21f5ad564360d4bcd69895f85d5bbe322
Author: Jeremy Freudberg <jeremyfreudberg@gmail.com>
Date:   Thu Sep 24 13:22:26 2020 -0400

    support --build-timeout
    
    new CLI option
    this will be useful for RDO ppc64le container building, at least.
    
    Change-Id: I25958a72bea36d952906db9e1ea8d433daff3865

diff --git a/roles/build-containers/templates/build.sh.j2 b/roles/build-containers/templates/build.sh.j2
index 9fb0c63..1988b67 100644
--- a/roles/build-containers/templates/build.sh.j2
+++ b/roles/build-containers/templates/build.sh.j2
@@ -34,6 +34,9 @@ openstack overcloud container image build {{ container_config }}\
     {% if ci_branch not in ['queens', 'rocky', 'stein'] %}
         --work-dir /tmp/container-builds \
     {% endif %}
+    {% if build_timeout is defined %}
+        --build-timeout {{ build_timeout }} \
+    {% endif %}
     --kolla-config-file {{ workspace }}/kolla-build.conf
 {% else %}
 ### build
@@ -100,6 +103,9 @@ openstack tripleo container image build \
      --config-file {{ openstack_git_root }}/{% if zuul_internal is defined %}openstack-{% endif %}tripleo-common/container-images/tripleo_containers.yaml \
      --config-path {{ openstack_git_root }}/{% if zuul_internal is defined %}openstack-{% endif %}tripleo-common/container-images \
      --work-dir /tmp/container-builds \
+{%   if build_timeout is defined %}
+     --build-timeout {{ build_timeout }} \
+{%   endif %}
      --debug 2> containers-build-errors.log
 {%   endif %}
 RETCODE=$?