diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 59 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 13 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 16 |
5 files changed, 38 insertions, 53 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8c7e4b0f..0e896d6d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,6 +38,7 @@ build-essential \ bundler \ crudini \ curl \ +dnsmasq \ gcc \ git \ libffi-dev \ diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index 1b553b1c..1257206d 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -1,39 +1,25 @@ -From: Delia Popescu <delia.popescu@enea.com> -Date: Thu, 20 Jul 2017 17:36:13 +0300 -Subject: [PATCH] Modified Dockerfile.aarch to a patch - -Docker image for functest on ARM was build using a different Dockerfile. -Now the ARM Dockerfile is created with a patch, -in order to avoid modifying both files. -This Dockerfile.aarch64.patch is applied by opnfv-docker.sh from releng project. - -Signed-off-by: Delia Popescu <delia.popescu@enea.com> ---- - docker/Dockerfile | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - diff --git a/docker/Dockerfile b/docker/Dockerfile -index 924da68..dd87e6c 100644 +index 0e896d6d..2a8f2b66 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ ######################################## -# Docker container for FUNCTEST -+# Aarch64 Docker container for FUNCTEST ++# Aarch64 Docker container for FUNCTEST ######################################## # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -7,9 +7,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 # - + -FROM ubuntu:14.04 -MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com> -LABEL version="0.1" description="OPNFV Functest Docker container" +FROM aarch64/ubuntu:14.04 +MAINTAINER Armband team <armband@enea.com> +LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container" - + # Environment variables ARG BRANCH=master @@ -43,6 +43,7 @@ gcc \ @@ -44,18 +30,33 @@ index 924da68..dd87e6c 100644 libpq-dev \ libssl-dev \ libxml2-dev \ -@@ -117,11 +118,13 @@ RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ - && cd ${REPOS_VNFS_DIR}/vims-test \ - && rvm use 1.9.3" - RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ -+ && gem install bundler \ - && cd ${REPOS_VNFS_DIR}/vims-test \ -+ && bundle config build.nokogiri --use-system-libraries \ - && bundle install" - +@@ -103,10 +104,26 @@ RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/se + RUN ln -s /src/tempest /src/refstack-client/.tempest \ + && virtualenv --system-site-packages /src/tempest/.venv + +-RUN cd /src/vims-test && bundle install ++RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 ++RUN curl -L https://get.rvm.io | bash -s stable + -RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \ - && sudo apt-get install -y nodejs \ ++RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ ++ && cd /src/vims-test \ ++ && rvm autolibs enable" ++RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ ++ && cd /src/vims-test \ ++ && rvm install 1.9.3" ++RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ ++ && cd /src/vims-test \ ++ && rvm use 1.9.3" ++RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ ++ && gem install bundler \ ++ && cd /src/vims-test \ ++ && bundle config build.nokogiri --use-system-libraries \ ++ && bundle install" ++ +RUN sh -c 'wget -qO- https://nodejs.org/dist/v4.7.2/node-v4.7.2-linux-arm64.tar.gz | \ + tar -xz -C /usr/local --exclude=CHANGELOG.md --exclude=LICENSE --exclude=README.md --strip-components 1 '\ - && 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 + diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 052bd47f..69da9350 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -92,18 +92,17 @@ tiers: - case_name: barometercollectd - enabled: false + enabled: true project_name: barometer criteria: 100 blocking: false description: >- - Test suite for the Barometer project. Separate tests verify the - proper configuration and functionality of the following - collectd plugins Ceilometer, Hugepages, Memory RAS (mcelog), - and OVS Events + Test suite for the Barometer project. Separate tests verify + the proper configuration and basic functionality of all the + collectd plugins as described in the Project Release Plan dependencies: - installer: 'fuel' - scenario: 'kvm_ovs_dpdk_bar' + installer: 'apex' + scenario: 'bar' run: module: 'baro_tests.barometer' class: 'BarometerCollectd' diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 70c13ab2..d4f18c47 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -3,7 +3,7 @@ FROM opnfv/functest-core ARG VIMS_TAG=stable RUN apk --no-cache add --update \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc \ + ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ procps git 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 && \ diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 1a42101e..9f653393 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -20,22 +20,6 @@ tiers: run: module: 'functest.opnfv_tests.vnf.ims.cloudify_ims' class: 'CloudifyIms' - - - - case_name: aaa - enabled: false - project_name: functest - criteria: 100 - blocking: false - description: >- - Simple VNF. - dependencies: - installer: '' - scenario: '' - run: - module: 'functest.opnfv_tests.vnf.aaa.aaa' - class: 'AaaVnf' - - case_name: orchestra_openims project_name: functest |