diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-11 12:44:01 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-12 10:22:03 +0100 |
| commit | 1bdf68f6ed2d55d72d47c0ee4c7a7bc286c4ca3d (patch) | |
| tree | 26bb7bd0c9d7af950294ab6c31ef7b761c2d0b2c /docker/smoke | |
| parent | eb973db776e77781c875d2640c4d59f878ba27c0 (diff) | |
Rewrite refstack testcase
It now leverages on rally to factorize code between all tempest-based
testcases.
refstack-client is also added as requirement.
JIRA: FUNCTEST-942
Change-Id: Ieee845327f8736582d77b898edd6c9edd00667e0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 91885f165..85d942a1e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -5,7 +5,6 @@ ARG OPENSTACK_TAG=stable/pike ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 -ARG REFSTACK_TAG=a59189eaacda24b787ecb65e6634257beba361ec ARG REFSTACK_TARGET=2017.09 COPY thirdparty-requirements.txt thirdparty-requirements.txt @@ -22,20 +21,16 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ - git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \ - (cd /src/refstack-client && git checkout $REFSTACK_TAG) && \ - update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ tempest /src/os-faults && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - -e/src/refstack-client /src/rally -rthirdparty-requirements.txt && \ + /src/rally -rthirdparty-requirements.txt && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd /src/odl_test && git checkout $ODL_TAG) && \ - ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ + rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \ /src/os-faults /src/rally && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 5b1f56a9d..62ac80a59 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -78,14 +78,14 @@ tiers: blocking: false description: >- This test case runs a sub group of tests of the OpenStack - Defcore testcases by using refstack client. + Defcore testcases. dependencies: installer: '' scenario: '' run: module: - 'functest.opnfv_tests.openstack.refstack_client.refstack_client' - class: 'RefstackClient' + 'functest.opnfv_tests.openstack.refstack.refstack' + class: 'Refstack' - case_name: odl |