From 10928a4a6bed8b3c0d680b0aa77405622ac660c5 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 2 Apr 2020 18:37:30 +0200 Subject: Add tempest_heat (heat-tempest-plugin) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/smoke/Dockerfile | 12 ++++++++++-- docker/smoke/testcases.yaml | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index fe1e2595e..de50fb59f 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -10,6 +10,7 @@ ARG CINDER_TEMPEST_TAG=0.2.0 ARG KEYSTONE_TEMPEST_TAG=0.2.0 ARG BARBICAN_TAG=0.1.0 ARG OCTAVIA_TAG=1.0.0 +ARG HEAT_TEMPEST_TAG=37a8df97277b42693ead3f5709f23544788f5a9f RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ @@ -51,10 +52,16 @@ 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 \ networking-bgpvpn networking-sfc /src/cinder-tempest-plugin \ - /src/keystone-tempest-plugin /src/octavia-tempest-plugin && \ + /src/keystone-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 && \ @@ -65,7 +72,8 @@ RUN apk --no-cache add --update libxml2 libxslt && \ deactivate && \ 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/cinder-tempest-plugin /src/keystone-tempest-plugin \ + /src/octavia-tempest-plugin /src/heat-tempest-plugin && \ apk del .build-deps COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt COPY object.txt /home/opnfv/functest/data/refstack/object.txt diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index cafec0301..80ec81fb0 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -54,6 +54,21 @@ tiers: option: - '--concurrency=3' + - + case_name: tempest_heat + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Heat project. + run: + name: tempest_heat + args: + mode: '^heat_tempest_plugin.tests' + option: + - '--concurrency=4' + - case_name: rally_sanity project_name: functest -- cgit 1.2.3-korg