diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 5 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/parser/hooks/post_checkout | 6 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 2 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 2 |
9 files changed, 23 insertions, 13 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 5d934dfe9..2e59adad6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -52,6 +52,8 @@ python-dev \ python-mock \ python-pip \ python3 \ +python3-dev \ +python3-pip \ postgresql \ ruby \ ruby-dev \ @@ -62,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 \ @@ -92,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/features/Dockerfile b/docker/features/Dockerfile index f20c58619..1ff2dc42f 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -6,12 +6,16 @@ ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt 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 \ + 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 e8a2095c5..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 diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 0a9f2a101..618f750be 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -2,4 +2,5 @@ baro_tests sdnvpn sfc promise +doctor-tests;python_version>='3.0' domino diff --git a/docker/parser/hooks/post_checkout b/docker/parser/hooks/post_checkout deleted file mode 100644 index 8f5e4337a..000000000 --- a/docker/parser/hooks/post_checkout +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core:euphrates" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile - -exit $? diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 23adcc852..50eb8a890 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -12,7 +12,7 @@ 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 build-base linux-headers libffi-dev \ + 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 && \ @@ -22,6 +22,10 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ -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 && \ diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt index 0a9f2a101..618f750be 100644 --- a/docker/restapi/thirdparty-requirements.txt +++ b/docker/restapi/thirdparty-requirements.txt @@ -2,4 +2,5 @@ baro_tests sdnvpn sfc promise +doctor-tests;python_version>='3.0' domino diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 741eb8ef6..a63545777 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -2,7 +2,7 @@ baro_tests sdnvpn 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/testcases.yaml b/docker/vnf/testcases.yaml index c0eba8225..64c0024ef 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -56,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' |