diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/healthcheck/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 15 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 17 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 31 |
4 files changed, 71 insertions, 4 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 451115cad..1876b5e43 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -3,6 +3,7 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=master ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 +ARG TEMPEST_HORIZON_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ @@ -12,14 +13,19 @@ RUN apk --no-cache add --virtual .build-deps --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ + git init /src/tempest-horizon && \ + (cd /src/tempest-horizon && \ + git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/tempest-horizon/ && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - -rthirdparty-requirements.txt && \ + /src/tempest-horizon -rthirdparty-requirements.txt && \ git init /src/odl_test && \ (cd /src/odl_test && \ git fetch --tags https://git.opendaylight.org/gerrit/integration/test $ODL_TAG && \ git checkout FETCH_HEAD) && \ - rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \ - upper-constraints.opnfv.txt && \ + rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt \ + upper-constraints.txt upper-constraints.opnfv.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 5aac7010e..c2a66494d 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -162,3 +162,18 @@ tiers: mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' option: - '--concurrency=4' + + - + case_name: tempest_horizon + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Horizon project. + dependencies: + - DASHBOARD_URL: '^(?!\s*$).+' + run: + name: tempest_horizon + args: + mode: '^tempest_horizon.' diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 1de3ff696..39e7be464 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -5,10 +5,13 @@ ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master +ARG CINDER_TEMPEST_TAG=master +ARG KEYSTONE_TEMPEST_TAG=master ARG BARBICAN_TAG=master ARG OCTAVIA_TAG=master -RUN apk --no-cache add --virtual .build-deps --update \ +RUN apk --no-cache add --update libxml2 libxslt && \ + apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ @@ -26,6 +29,16 @@ RUN apk --no-cache add --virtual .build-deps --update \ git fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ + git init /src/cinder-tempest-plugin && \ + (cd /src/cinder-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/cinder-tempest-plugin.git $CINDER_TEMPEST_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/cinder-tempest-plugin && \ + git init /src/keystone-tempest-plugin && \ + (cd /src/keystone-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/keystone-tempest-plugin.git $KEYSTONE_TEMPEST_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/keystone-tempest-plugin && \ git init /src/barbican-tempest-plugin && \ (cd /src/barbican-tempest-plugin && \ git fetch --tags https://opendev.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \ @@ -38,6 +51,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/octavia-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 && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ @@ -49,6 +63,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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/neutron && \ apk del .build-deps COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index cb5e6ea9c..85dc9969f 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -24,6 +24,37 @@ tiers: - '--concurrency=4' - + case_name: tempest_cinder + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Cinder project. + run: + name: tempest_common + args: + mode: + '(?!.*test_incremental_backup)(^cinder_tempest_plugin.)' + option: + - '--concurrency=4' + + - + case_name: tempest_keystone + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Keystone project. + run: + name: tempest_common + args: + mode: 'keystone_tempest_plugin.' + option: + - '--concurrency=4' + + - case_name: rally_sanity project_name: functest criteria: 100 |