diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/restapi/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 16 |
3 files changed, 36 insertions, 5 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 81b79fd86..b36525f95 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -12,7 +12,7 @@ ARG VIMS_TAG=stable COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps libxslt libxml2 zlib libffi && \ + procps libxslt libxml2 zlib libffi go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ python-dev python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev \ @@ -45,9 +45,14 @@ RUN apk --no-cache add --update python3 sshpass \ 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 --python=python2.7 && \ + git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ + python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + juju-wait && \ + go get github.com/rogpeppe/godeps && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ - /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git && \ + /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git /src/epc-requirements/abot_charm/.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 db create && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index ac3b8dab0..6d96d98a5 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,15 +1,25 @@ FROM opnfv/functest-core +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/pike ARG VIMS_TAG=stable RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps libxslt libxml2 zlib libffi && \ + procps libxslt libxml2 zlib libffi python3 go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + > upper-constraints.txt && \ 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 && \ + git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ + python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + juju-wait && \ + go get github.com/rogpeppe/godeps && \ + (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ + rm -r upper-constraints.txt /src/vims-test/.git /src/epc-requirements/abot_charm/.git && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index d235c1df9..f4318d780 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -65,3 +65,19 @@ tiers: module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' class: 'ClearwaterImsVnf' + + - + case_name: juju_epc + enabled: true + project_name: functest + criteria: 100 + blocking: false + description: >- + vEPC validation with Juju as VNF manager and ABoT as test + executor. + dependencies: + installer: '' + scenario: 'os-nosdn-nofeature-ha' + run: + module: 'functest.opnfv_tests.vnf.epc.juju_epc' + class: 'JujuEpc' |