From dc2d33642a8e0361a5d9898d67d0a6a51f697d1f Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 21 Feb 2019 15:04:40 -0500 Subject: [PATCH] Increase yum timeout in stx-centos base image There have been intermittent failures building StarlingX docker images due to failures to reach the mirrors within the default timeout, during the formal CENGN builds. This update adds a step to the docker files for the stx-centos base image and the base wheel builder image to set a new timeout value in the yum.conf file, increasing from the default 30 seconds to 120 seconds. Change-Id: Ide52cdebb053f639cfe6d4c3a6c5eef71e6fa8ab Story: 2004751 Task: 29636 Signed-off-by: Don Penney --- build-tools/build-docker-images/stx-centos/Dockerfile.master | 1 + build-tools/build-docker-images/stx-centos/Dockerfile.pike | 1 + build-tools/build-wheels/docker/centos-dockerfile | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build-tools/build-docker-images/stx-centos/Dockerfile.master b/build-tools/build-docker-images/stx-centos/Dockerfile.master index 8bf76312..4132baa0 100644 --- a/build-tools/build-docker-images/stx-centos/Dockerfile.master +++ b/build-tools/build-docker-images/stx-centos/Dockerfile.master @@ -5,6 +5,7 @@ ARG RELEASE=7.5.1804 FROM centos:${RELEASE} RUN set -ex ;\ + sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\ yum install -y centos-release-openstack-rocky ;\ rm -rf \ /var/log/* \ diff --git a/build-tools/build-docker-images/stx-centos/Dockerfile.pike b/build-tools/build-docker-images/stx-centos/Dockerfile.pike index 926cf2be..7969a2ad 100644 --- a/build-tools/build-docker-images/stx-centos/Dockerfile.pike +++ b/build-tools/build-docker-images/stx-centos/Dockerfile.pike @@ -11,6 +11,7 @@ ARG REPO_OPTS COPY stx.repo / RUN set -ex ;\ + sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\ mv /stx.repo /etc/yum.repos.d/ ;\ yum upgrade --disablerepo=* ${REPO_OPTS} -y ;\ yum install --disablerepo=* ${REPO_OPTS} -y \ diff --git a/build-tools/build-wheels/docker/centos-dockerfile b/build-tools/build-wheels/docker/centos-dockerfile index f5a48449..5df2ca31 100644 --- a/build-tools/build-wheels/docker/centos-dockerfile +++ b/build-tools/build-wheels/docker/centos-dockerfile @@ -6,7 +6,9 @@ ARG OPENSTACK_RELEASE=pike # Install the necessary packages for building the python modules. # Some of these are dependencies of the specific modules, and could # instead be added to the wheels.cfg file in the future. -RUN yum install -y epel-release centos-release-openstack-queens ;\ +RUN set -ex ;\ + sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\ + yum install -y epel-release centos-release-openstack-queens ;\ yum install -y git gcc zip bzip2 unzip \ python python-devel python-pip python-wheel \ wget openldap-devel mariadb mariadb-devel \