diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-02 18:37:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-11 09:20:52 +0200 |
| commit | b97dedc2c1b222901ce3dd4a2a71ca361f3f0792 (patch) | |
| tree | 4c88a3fbfcfbe2a757a5a77276bb4289de765795 /docker/smoke/Dockerfile | |
| parent | f88a304380916dd44be49caecaae2b37b8d8ec14 (diff) | |
Add tempest_heat (heat-tempest-plugin)
It asks for the Fedora-Cloud-Base image and a second user account.
It should be noted that heat-tempest-plugin duplicates all configs from
tempest.
Minimal image is still Cirros and the first account is the admin one.
Then it conforms with the TempestCommon logic.
AodhAlarmTest is skipped by default because pre conditions are missing.
SoftwareConfigIntegrationTest is skipped as in gates because it
requires a custom image [1]
[1] https://github.com/openstack/heat/blob/master/devstack/lib/heat#L444
Change-Id: I8b39dc65ef3714411cd828e17b95e124f2e90f34
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index f8f0c41b2..c390ab5b6 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -9,6 +9,7 @@ ARG CINDER_TEMPEST_TAG=0.3.0 ARG KEYSTONE_TEMPEST_TAG=0.3.0 ARG BARBICAN_TAG=0.3.0 ARG OCTAVIA_TAG=1.2.0 +ARG HEAT_TEMPEST_TAG=37a8df97277b42693ead3f5709f23544788f5a9f RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ @@ -53,10 +54,15 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git fetch --tags https://git.openstack.org/openstack/octavia-tempest-plugin.git $OCTAVIA_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/octavia-tempest-plugin && \ + git init /src/heat-tempest-plugin && \ + (cd /src/heat-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/heat-tempest-plugin.git $HEAT_TEMPEST_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/heat-tempest-plugin && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ - /src/octavia-tempest-plugin && \ + /src/octavia-tempest-plugin /src/heat-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/glance && \ wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ @@ -68,7 +74,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ - /src/octavia-tempest-plugin /src/neutron && \ + /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/neutron && \ apk del .build-deps COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt COPY object.txt /home/opnfv/functest/data/refstack/object.txt |