diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-14 03:05:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-14 03:05:12 +0000 |
| commit | 7e2fa1942daf7b276064ca6bd7a4fcc87de16578 (patch) | |
| tree | 69f9dff5b17c4fed920e150af7402a4c17d275ef /docker | |
| parent | 95c0371e3fe3d515a96d941bf303a853a3f2787b (diff) | |
| parent | 0ce4ba21f5b934431adfa8a96f20065483a9f5c9 (diff) | |
Merge "Implement trunk ports testcase"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/restapi/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 17 |
3 files changed, 29 insertions, 0 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 32a8b3964..3286c8753 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -51,6 +51,12 @@ RUN apk --no-cache add --update python3 sshpass \ juju-wait && \ go get github.com/rogpeppe/godeps && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e git+https://github.com/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -r /src/neutron/test-requirements.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index ad0ae9fcd..e09ea1c2c 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -34,6 +34,12 @@ RUN apk --no-cache add --virtual .build-deps --update \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd /src/odl_test && git checkout $ODL_TAG) && \ virtualenv --system-site-packages /src/tempest/.venv && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e git+https://github.com/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -r /src/neutron/test-requirements.txt && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \ /src/os-faults /src/rally && \ mkdir -p /etc/rally && \ diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 9f017e5f3..44539c9ea 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -171,3 +171,20 @@ tiers: run: module: 'functest.opnfv_tests.openstack.snaps.smoke' class: 'SnapsSmoke' + + - + case_name: neutron_trunk + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the neutron trunk subtest of the + OpenStack Tempest suite. The list of test cases is + generated by Tempest having as input the relevant + testcase list file. + dependencies: + installer: '(fuel)|(apex)|(compass)' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestNeutronTrunk' |