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 | 10 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 25 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 2 | ||||
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 2 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 17 | ||||
| -rw-r--r-- | docker/parser/testcases.yaml | 3 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 42 | ||||
| -rw-r--r-- | docker/restapi/hooks/post_checkout | 6 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 6 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/smoke/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 8 |
16 files changed, 100 insertions, 61 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 603bc38b9..ec2b3fa64 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,9 +14,10 @@ LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables ARG BRANCH=master ARG RALLY_TAG=stable/0.9 -ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable +ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 ARG REPOS_DIR=/home/opnfv/repos ARG FUNCTEST_BASE_DIR=/home/opnfv/functest ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf @@ -51,6 +52,8 @@ python-dev \ python-mock \ python-pip \ python3 \ +python3-dev \ +python3-pip \ postgresql \ ruby \ ruby-dev \ @@ -61,6 +64,7 @@ wget \ --no-install-recommends RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 +RUN python3 -m pip install --upgrade pip setuptools==30.0.0 RUN mkdir -p ${REPOS_VNFS_DIR} \ && mkdir -p ${FUNCTEST_BASE_DIR}/results \ @@ -78,10 +82,11 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe > 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 && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ 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 \ @@ -90,6 +95,10 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ -rthirdparty-requirements.txt && \ + python3 -m pip install --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 \ + doctor-tests && \ 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 && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c5766da30..04e32598e 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -15,7 +15,7 @@ RUN apk --no-cache add --update \ > upper-constraints.txt && \ 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/requirements@stable/ocata#egg=openstack_requirements && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 --no-cache-dir --src /src -cupper-constraints.txt \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index c3b1b041d..1ab4142f2 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -4,14 +4,18 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --update nodejs nodejs-npm python3 && \ +RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ - python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev git && \ + python-dev python3-dev build-base linux-headers libffi-dev \ + openssl-dev libjpeg-turbo-dev && \ 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 && \ + python3 -m 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 \ + doctor-tests && \ npm -g install npm@latest && \ (cd /src/promise/source && npm install) && \ rm -r thirdparty-requirements.txt && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 273a20e77..dc137429b 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -25,20 +25,19 @@ tiers: - case_name: doctor-notification - enabled: false project_name: doctor criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: '(apex)|(fuel)' + installer: 'apex' scenario: '^((?!fdio).)*$' run: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '(cd /src/doctor-test/tests && run.sh)' + cmd: 'doctor-test' - case_name: bgpvpn @@ -57,25 +56,7 @@ tiers: cmd: 'run_sdnvpn_tests.py' - - case_name: security_scan - enabled: false - project_name: securityscanning - criteria: 100 - blocking: false - description: >- - Simple Security Scan - dependencies: - installer: 'apex' - scenario: '^((?!fdio).)*$' - run: - module: 'functest.core.feature' - class: 'BashFeature' - args: - cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/etc/securityscanning/config.ini' - - - case_name: functest-odl-sfc - enabled: true project_name: sfc criteria: 100 blocking: false @@ -92,7 +73,6 @@ tiers: - case_name: domino-multinode - enabled: false project_name: domino criteria: 100 blocking: false @@ -109,7 +89,6 @@ tiers: - case_name: barometercollectd - enabled: true project_name: barometer criteria: 100 blocking: false diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 4a0b6ff88..618f750be 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,6 +1,6 @@ baro_tests sdnvpn -securityscanning sfc promise +doctor-tests;python_version>='3.0' domino diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index e43c7c77c..ea2053f2f 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -38,7 +38,7 @@ tiers: the cloud's private network. dependencies: installer: '^((?!netvirt).)*$' - scenario: '' + scenario: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.api_check' class: 'ApiCheck' diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index e0dc0d5cd..a28a1f5b0 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -11,18 +11,17 @@ RUN apk --no-cache add --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 \ + sed /^heat-translator=/d | sed /^tosca-parser=/d | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ + 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/requirements@stable/ocata#egg=openstack_requirements && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#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 \ + 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 && \ + 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 \ diff --git a/docker/parser/testcases.yaml b/docker/parser/testcases.yaml index 4ab3fae2b..45ccb0beb 100644 --- a/docker/parser/testcases.yaml +++ b/docker/parser/testcases.yaml @@ -9,14 +9,13 @@ tiers: testcases: - case_name: parser-basics - enabled: false project_name: parser criteria: 100 blocking: false description: >- Test suite from Parser project. dependencies: - installer: 'fuel' + installer: '' scenario: '^((?!bgpvpn|noha).)*$' run: module: 'functest.core.feature' diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile new file mode 100644 index 000000000..35f8577fd --- /dev/null +++ b/docker/restapi/Dockerfile @@ -0,0 +1,42 @@ +FROM opnfv/functest-core + +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba +ARG FDS_TAG=master +ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 +ARG VIMS_TAG=stable + +COPY thirdparty-requirements.txt thirdparty-requirements.txt +RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ + apk --no-cache add --virtual .build-deps --update \ + python-dev python3-dev build-base linux-headers libffi-dev \ + openssl-dev libjpeg-turbo-dev \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ + 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 -rthirdparty-requirements.txt && \ + python3 -m 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 \ + doctor-tests && \ + 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 && \ + git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \ + ln -s /src/tempest /src/refstack-client/.tempest && \ + virtualenv --system-site-packages /src/tempest/.venv && \ + (cd /src/promise/source && npm install) && \ + (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ + npm -g install npm@latest && \ + rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ + /src/fds/.git /src/vims-test/.git && \ + apk del .build-deps +EXPOSE 5000 +CMD ["functest_restapi"] diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout new file mode 100644 index 000000000..20a6d4b95 --- /dev/null +++ b/docker/restapi/hooks/post_checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile + +exit $? diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt new file mode 100644 index 000000000..618f750be --- /dev/null +++ b/docker/restapi/thirdparty-requirements.txt @@ -0,0 +1,6 @@ +baro_tests +sdnvpn +sfc +promise +doctor-tests;python_version>='3.0' +domino diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 3b1e8d2e7..71042df1b 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,30 +2,26 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG FDS_TAG=master +ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 -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 && \ + (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ 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 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 \ - /src/fds/.git && \ + rm -r /src/refstack-client/.git /src/odl_test/.git /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/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt deleted file mode 100644 index b298601b7..000000000 --- a/docker/smoke/thirdparty-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -refstack-client diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index cc8f5f9c8..a63545777 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -1,9 +1,8 @@ baro_tests sdnvpn -securityscanning sfc promise -doctor-test +doctor-tests;python_version>='3.0' tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 refstack-client diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index d4f18c476..36e80d7e2 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -3,10 +3,13 @@ FROM opnfv/functest-core ARG VIMS_TAG=stable RUN apk --no-cache add --update \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ + apk --no-cache add --virtual .build-deps --update \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \ rm -r /src/vims-test/.git && \ - cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system + cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \ + 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/vnf/testcases.yaml b/docker/vnf/testcases.yaml index dea4a1eaf..f9e63da35 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -22,8 +22,7 @@ tiers: class: 'CloudifyIms' - case_name: orchestra_openims - project_name: functest - enabled: false + project_name: orchestra criteria: 100 blocking: false description: >- @@ -37,8 +36,7 @@ tiers: - case_name: orchestra_clearwaterims - project_name: functest - enabled: false + project_name: orchestra criteria: 100 blocking: false description: >- @@ -58,7 +56,7 @@ tiers: description: >- This test case is vRouter testing. dependencies: - installer: 'fuel' + installer: '' scenario: 'nosdn-nofeature' run: module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' |