diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 17 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 38 | ||||
| -rw-r--r-- | docker/parser/testcases.yaml | 25 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 |
8 files changed, 103 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index abb9b0d7..603bc38b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables ARG BRANCH=master ARG RALLY_TAG=stable/0.9 -ARG ODL_TAG=release/carbon +ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable ARG REPOS_DIR=/home/opnfv/repos @@ -50,6 +50,7 @@ libzmq3-dev \ python-dev \ python-mock \ python-pip \ +python3 \ postgresql \ ruby \ ruby-dev \ @@ -79,9 +80,12 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \ git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ - update-requirements -s --source /src/openstack-requirements /src/rally/ && \ + update-requirements -s --source /src/openstack-requirements /src/rally && \ + git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + update-requirements -s --source /src/openstack-requirements /src/refstack-client && \ pip install --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + /src/rally -e/src/refstack-client && \ pip install --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ @@ -95,7 +99,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds # other repositories -RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test +RUN git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + (cd src/odl_test && git checkout -b $ODL_TAG) RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test # Install tempest venv and create symlink for running refstack-client diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 172dbb9f..c5766da3 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -19,7 +19,7 @@ RUN apk --no-cache add --update \ git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally/ && \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index e1214c1e..c3b1b041 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -4,7 +4,7 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --update nodejs nodejs-npm && \ +RUN apk --no-cache add --update nodejs nodejs-npm python3 && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index b7cf81a8..273a20e7 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -24,6 +24,23 @@ tiers: cmd: 'run_promise_tests.py' - + case_name: doctor-notification + enabled: false + project_name: doctor + criteria: 100 + blocking: false + description: >- + Test suite from Doctor project. + dependencies: + installer: '(apex)|(fuel)' + scenario: '^((?!fdio).)*$' + run: + module: 'functest.core.feature' + class: 'BashFeature' + args: + cmd: '(cd /src/doctor-test/tests && run.sh)' + + - case_name: bgpvpn project_name: sdnvpn criteria: 100 diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile new file mode 100644 index 00000000..e0dc0d5c --- /dev/null +++ b/docker/parser/Dockerfile @@ -0,0 +1,38 @@ +FROM alpine:3.6 + +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/pike +ARG RALLY_TAG=stable/0.9 + +RUN apk --no-cache add --update \ + python libffi libssl1.0 libjpeg-turbo py-pip bash \ + grep sed wget ca-certificates git openssh-client && \ + apk --no-cache add --virtual .build-deps --update \ + python-dev build-base linux-headers libffi-dev \ + openssl-dev libjpeg-turbo-dev && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed /^heat-translator=/d | sed /^tosca-parser=/d \ + > upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \ + git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ + update-requirements -s --source /src/openstack-requirements /src/rally && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + /src/rally && \ + pip install --no-cache-dir --src /src \ + -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ + git+https://gerrit.opnfv.org/gerrit/parser#egg=heat-translator\&subdirectory=tosca2heat/heat-translator \ + git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \ + -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \ + rm -r upper-constraints.txt /src/rally/.git && \ + 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-manage db create && \ + bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ + 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/parser/testcases.yaml b/docker/parser/testcases.yaml new file mode 100644 index 00000000..4ab3fae2 --- /dev/null +++ b/docker/parser/testcases.yaml @@ -0,0 +1,25 @@ +tiers: + - + name: features + order: 2 + ci_loop: '(daily)|(weekly)' + description : >- + Test suites from feature projects + integrated in functest + testcases: + - + case_name: parser-basics + enabled: false + project_name: parser + criteria: 100 + blocking: false + description: >- + Test suite from Parser project. + dependencies: + installer: 'fuel' + scenario: '^((?!bgpvpn|noha).)*$' + run: + module: 'functest.core.feature' + class: 'BashFeature' + args: + cmd: 'cd /src/nfv-parser/tests && ./functest_run.sh' diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 10385470..3b1e8d2e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,18 +2,26 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=release/carbon +ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 +ARG FDS_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ + git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ + pip install --no-cache-dir --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e/src/refstack-client && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ - git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ - git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds && \ + git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + (cd src/odl_test && git checkout -b $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 thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 60bd0f28..cc8f5f9c 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -3,6 +3,7 @@ sdnvpn securityscanning sfc promise +doctor-test tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 refstack-client |