diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 50 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 |
5 files changed, 23 insertions, 42 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 54d526d67..1811e9389 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -84,7 +84,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds @@ -120,7 +119,7 @@ RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \ && sudo apt-get install -y nodejs \ - && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \ - && cd ${REPOS_DIR}/promise/source && npm install + && cd /src/promise && sudo npm -g install npm@latest \ + && cd /src/promise/source && npm install RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 73f4d2cef..54bffe827 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -4,16 +4,18 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --virtual .build-deps --update \ +RUN apk --no-cache add --update nodejs nodejs-npm && \ + apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ 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 && \ + npm -g install npm@latest && \ + (cd /src/promise/source && npm install) && \ git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino && \ - git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper && \ - rm -r thirdparty-requirements.txt /src/domino/.git /src/copper/.git && \ + rm -r thirdparty-requirements.txt /src/domino/.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 0fed95dee..052bd47f3 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -8,46 +8,45 @@ tiers: integrated in functest testcases: - - case_name: bgpvpn - project_name: sdnvpn + case_name: promise + project_name: promise criteria: 100 blocking: false description: >- - Test suite from SDNVPN project. + Test suite from Promise project. dependencies: - installer: '(fuel)|(apex)|(netvirt)' - scenario: 'bgpvpn' + installer: '(fuel)|(joid)' + scenario: '' run: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'run_sdnvpn_tests.py' + cmd: 'run_promise_tests.py' - - case_name: security_scan - enabled: false - project_name: securityscanning + case_name: bgpvpn + project_name: sdnvpn criteria: 100 blocking: false description: >- - Simple Security Scan + Test suite from SDNVPN project. dependencies: - installer: 'apex' - scenario: '^((?!fdio).)*$' + installer: '(fuel)|(apex)|(netvirt)' + scenario: 'bgpvpn' run: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini' + cmd: 'run_sdnvpn_tests.py' - - case_name: copper + case_name: security_scan enabled: false - project_name: copper + project_name: securityscanning criteria: 100 blocking: false description: >- - Test suite for policy management based on OpenStack Congress + Simple Security Scan dependencies: installer: 'apex' scenario: '^((?!fdio).)*$' @@ -55,7 +54,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'cd /src/copper/tests && bash run.sh && cd -' + cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini' - case_name: functest-odl-sfc @@ -92,23 +91,6 @@ tiers: cmd: 'cd /src/domino && ./tests/run_multinode.sh' - - case_name: gluon_vping - enabled: false - project_name: netready - criteria: 100 - blocking: false - description: >- - Test suite from Netready project. - dependencies: - installer: 'apex' - scenario: 'gluon' - run: - module: 'functest.core.feature' - class: 'BashFeature' - args: - cmd: 'gluon-test-suite.py' - - - case_name: barometercollectd enabled: false project_name: barometer diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index abc53119a..0fa9be36c 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -3,4 +3,3 @@ sdnvpn securityscanning sfc promise -netready diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index e720cad1f..84521f233 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -4,7 +4,6 @@ opera securityscanning sfc promise -netready tosca-parser>=0.7.0 # Apache-2.0 heat-translator>=0.4.0 # Apache-2.0 refstack-client |