diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-27 09:02:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-27 09:02:21 +0000 |
| commit | 563b56126991cfc2f3378f803e071ad79aca3487 (patch) | |
| tree | b29217509e8b997226c2b5e2300ccbfaeb30f5c4 | |
| parent | 3852721c819a0dc461192d8629adc001e0425ac8 (diff) | |
| parent | f98bd052719a92daf89eda0cd4dd9709d1e7e2be (diff) | |
| download | kolla-563b56126991cfc2f3378f803e071ad79aca3487.tar.gz kolla-563b56126991cfc2f3378f803e071ad79aca3487.zip | |
Merge "Add new image for tempest"
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 21 | ||||
| -rw-r--r-- | etc/kolla/kolla-build.conf | 4 |
2 files changed, 25 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 new file mode 100644 index 000000000..f8330f217 --- /dev/null +++ b/docker/tempest/Dockerfile.j2 @@ -0,0 +1,21 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + openstack-tempest \ + && yum clean all + + {% endif %} +{% elif install_type == 'source' %} + +ADD tempest-archive /tempest-source +RUN ln -s tempest-source/* tempest \ + && pip --no-cache-dir install -c requirements/upper-constraints.txt /tempest \ + && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock + +{% endif %} + +{{ include_footer }} diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf index 6368924f3..baaa29ff9 100644 --- a/etc/kolla/kolla-build.conf +++ b/etc/kolla/kolla-build.conf @@ -142,6 +142,10 @@ location = http://github.com/kanaka/noVNC/tarball/v0.5.1 type = url location = http://tarballs.openstack.org/swift/swift-master.tar.gz +[tempest] +type = url +location = http://tarballs.openstack.org/tempest/tempest-master.tar.gz + [zaqar] type = url location = http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz |