summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-10-26 01:37:37 +0000
committerLinda Wang <wangwulin@huawei.com>2017-11-06 14:12:45 +0000
commitfb3ffed7e8128416094e80ecf126c9ca51933c69 (patch)
tree6191a84b1ba02ae106872fc98cff97ffc9f98e3e /docker
parent5fe48568e50ad9a556cc4094ee05e76d9255a05d (diff)
Move fds to features tier
Change-Id: I7aa9d73c7ffbfdad7d5a929968fb640d9a8de62e Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/features/testcases.yaml19
-rw-r--r--docker/smoke/Dockerfile4
-rw-r--r--docker/smoke/testcases.yaml19
4 files changed, 23 insertions, 23 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 0d53655a5..6d590bd03 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
+ARG FDS_TAG=master
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
@@ -14,13 +15,14 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-rthirdparty-requirements.txt && \
+ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
doctor-tests && \
npm -g install npm@latest && \
# the next line must be uncommented as soon as promise is synced with pike
# (cd /src/promise/source && npm install) && \
- rm -r upper-constraints.txt thirdparty-requirements.txt && \
+ rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 5c72a2960..2c40a2906 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -106,3 +106,22 @@ tiers:
run:
module: 'baro_tests.barometer'
class: 'BarometerCollectd'
+
+ -
+ case_name: fds
+ project_name: fastdatastacks
+ criteria: 100
+ blocking: false
+ description: >-
+ Test Suite for the OpenDaylight SDN Controller when GBP features are
+ installed. It integrates some test suites from upstream using
+ Robot as the test framework.
+ dependencies:
+ installer: 'apex'
+ scenario: 'odl.*-fdio'
+ run:
+ module: 'functest.opnfv_tests.sdn.odl.odl'
+ class: 'ODLTests'
+ args:
+ suites:
+ - /src/fds/testing/robot
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index ae56a6c75..6ece363a6 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,7 +3,6 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
ARG ODL_TAG=master
-ARG FDS_TAG=master
ARG REFSTACK_TAG=master
RUN apk --no-cache add --virtual .build-deps --update \
@@ -20,10 +19,9 @@ RUN apk --no-cache add --virtual .build-deps --update \
-e/src/refstack-client && \
git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
(cd src/odl_test && git checkout $ODL_TAG) && \
- git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
- rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \
+ rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index f8866e8a9..499713aae 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -127,25 +127,6 @@ tiers:
- /src/odl_test/csit/suites/openstack/connectivity
-
- case_name: fds
- project_name: fastdatastacks
- criteria: 100
- blocking: false
- description: >-
- Test Suite for the OpenDaylight SDN Controller when GBP features are
- installed. It integrates some test suites from upstream using
- Robot as the test framework.
- dependencies:
- installer: 'apex'
- scenario: 'odl.*-fdio'
- run:
- module: 'functest.opnfv_tests.sdn.odl.odl'
- class: 'ODLTests'
- args:
- suites:
- - /src/fds/testing/robot
-
- -
case_name: snaps_smoke
project_name: functest
criteria: 100