diff options
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 17 | ||||
| -rw-r--r-- | docker/smoke/hooks/post_checkout | 2 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 39 |
3 files changed, 19 insertions, 39 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 7e4939a41..58d096108 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,14 +4,12 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.3.0 -ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 -ARG NEUTRON_TAG=d307f5635d4015e7842a4a177f66c76ba4bd818a -ARG BARBICAN_TAG=b8bf147bdcdd33f3ad276ca8815fd253ec9b24af +ARG NEUTRON_TAG=0.2.0 +ARG BARBICAN_TAG=0.1.0 -RUN apk --no-cache add --update libxml2 libxslt && \ - apk --no-cache add --virtual .build-deps --update \ +RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ + openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ @@ -20,9 +18,6 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git clone --depth 1 https://git.openstack.org/openstack/patrole.git /src/patrole && \ (cd /src/patrole && git fetch --tags origin $PATROLE_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ - git clone https://git.openstack.org/openstack/vmtp.git /src/vmtp && \ - (cd /src/vmtp && git fetch origin --tags $VMTP_TAG && git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \ git clone https://git.openstack.org/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \ (cd /src/neutron-tempest-plugin && git fetch --tags origin $NEUTRON_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ @@ -31,9 +26,9 @@ RUN apk --no-cache add --update libxml2 libxslt && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ pip 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/vmtp && \ + networking-bgpvpn networking-sfc && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin /src/vmtp && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ -O /home/opnfv/functest/data/refstack/defcore.txt && \ diff --git a/docker/smoke/hooks/post_checkout b/docker/smoke/hooks/post_checkout index 8d0e98124..3e5670b4a 100644 --- a/docker/smoke/hooks/post_checkout +++ b/docker/smoke/hooks/post_checkout @@ -1,6 +1,6 @@ #!/bin/bash -from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" +from="${DOCKER_REPO%/*}/functest-tempest:${DOCKER_TAG}" sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile exit $? diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 7c22e838c..2897e1045 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -18,8 +18,7 @@ tiers: the OpenStack deplopyment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L114 run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' option: @@ -36,8 +35,7 @@ tiers: Tempest automatically and depends on the parameters of the OpenStack deployment. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^neutron_tempest_plugin\.api' option: @@ -52,8 +50,7 @@ tiers: This test case runs a sub group of tests of the OpenStack Rally suite in smoke mode. run: - module: 'functest.opnfv_tests.openstack.rally.rally' - class: 'RallySanity' + name: rally_sanity - case_name: refstack_defcore @@ -64,9 +61,7 @@ tiers: This test case runs a sub group of tests of the OpenStack Defcore testcases. run: - module: - 'functest.opnfv_tests.openstack.refstack.refstack' - class: 'Refstack' + name: refstack_defcore args: option: - '--concurrency=4' @@ -79,8 +74,7 @@ tiers: description: >- Test suite from Patrole project. run: - module: 'functest.opnfv_tests.openstack.patrole.patrole' - class: 'Patrole' + name: patrole args: role: 'admin' includes: @@ -101,9 +95,7 @@ tiers: dependencies: - POD_ARCH: '^(?!aarch64$)' run: - module: - 'functest.opnfv_tests.openstack.vmtp.vmtp' - class: 'Vmtp' + name: vmtp - case_name: shaker @@ -116,9 +108,7 @@ tiers: is able to deploy OpenStack instances and networks in different topologies. run: - module: - 'functest.opnfv_tests.openstack.shaker.shaker' - class: 'Shaker' + name: shaker - case_name: snaps_smoke @@ -134,8 +124,7 @@ tiers: snaps.use_keystone is True, functest must have access to the cloud's private network. run: - module: 'functest.opnfv_tests.openstack.snaps.smoke' - class: 'SnapsSmoke' + name: snaps_smoke - case_name: neutron_trunk @@ -148,8 +137,7 @@ tiers: generated by Tempest having as input the relevant testcase list file. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: 'neutron_tempest_plugin.(api|scenario).test_trunk' neutron_extensions: @@ -166,8 +154,7 @@ tiers: suite. The list of test cases is generated by Tempest having as input the relevant regex. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^networking_bgpvpn_tempest\.' neutron_extensions: @@ -185,8 +172,7 @@ tiers: suite. The list of test cases is generated by Tempest having as input the relevant regex. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$' @@ -204,8 +190,7 @@ tiers: It leverages on the tempest plugin containing tests used to verify the functionality of a barbican installation. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: 'barbican_tempest_plugin.tests.(api|scenario).(?!test_image_signing)' |