diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-22 08:44:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-22 08:44:16 +0000 |
| commit | 27ab91b2abfc7e5e3906c335fe29698a6ca34527 (patch) | |
| tree | 8b567a34d7ca242b1a59e1886fde6858dc6a0e65 | |
| parent | eb30cf704f5c0b98d566a141e9676b8ad8aeadcb (diff) | |
| parent | 6b6003b92593730d94ec6f004af1fbd777019a16 (diff) | |
| download | kolla-27ab91b2abfc7e5e3906c335fe29698a6ca34527.tar.gz kolla-27ab91b2abfc7e5e3906c335fe29698a6ca34527.zip | |
Merge "Use 3 hours timeout for gate jobs and install yum-axelget"
| -rw-r--r-- | .zuul.yaml | 5 | ||||
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 172dc34c4..418a0db7f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -84,7 +84,7 @@ - job: name: kolla-base parent: base - timeout: 5400 + timeout: 10200 pre-run: tests/playbooks/pre.yml run: tests/playbooks/run.yml post-run: tests/playbooks/post.yml @@ -120,7 +120,6 @@ - job: name: kolla-publish-centos-source parent: kolla-build-centos-source - timeout: 10800 post-run: tests/playbooks/publish.yml vars: publisher: true @@ -149,7 +148,6 @@ - job: name: kolla-publish-ubuntu-source parent: kolla-build-ubuntu-source - timeout: 10800 post-run: tests/playbooks/publish.yml vars: publisher: true @@ -178,7 +176,6 @@ - job: name: kolla-publish-oraclelinux-source parent: kolla-build-oraclelinux-source - timeout: 10800 post-run: tests/playbooks/publish.yml vars: publisher: true diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b234a460..35599896a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -224,7 +224,8 @@ RUN yum -y install \ 'python', 'scsi-target-utils', 'sudo', - 'which' + 'which', + 'yum-axelget' ] %} # Install base packages {{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} @@ -241,7 +242,8 @@ RUN yum -y install \ 'scsi-target-utils', 'sudo', 'tar', - 'which' + 'which', + 'yum-axelget' ] %} # Update packages {{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }} |