X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2FDockerfile;h=cf67c8a772334c1b2f2d9ff75be4ba33ee3f33b3;hb=f754beeeba3f27e1eefaffca0a8c1cd05545e050;hp=fe5dbfb4a907e317e15648ab3a9029144b266e69;hpb=75d581a9d3ec7c11a9a696db4b271c2691c28f15;p=functest.git

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index fe5dbfb4a..cf67c8a77 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -19,12 +19,13 @@ ENV PATH $GOBIN:$PATH
 
 COPY clearwater-heat-singlenet-deps.patch /tmp/clearwater-heat-singlenet-deps.patch
 RUN apk --no-cache add --update \
-        ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
-        procps libxslt libxml2 zlib libffi python3 go musl-dev && \
+        ruby ruby-bundler ruby-irb ruby-rdoc \
+        procps libxslt libxml2 zlib libffi go musl-dev && \
     apk --no-cache add --virtual .build-deps --update \
         ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
-    sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+    sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
     git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \
@@ -55,23 +56,26 @@ RUN apk --no-cache add --update \
     (cd /home/opnfv/functest/data/router/opnfv-vnf-data && \
         git fetch --tags https://github.com/oolorg/opnfv-vnf-data.git $VROUTER_TAG && \
         git checkout FETCH_HEAD) && \
-    git init /src/epc-requirements/abot_charm && \
-    (cd /src/epc-requirements/abot_charm && \
-        git fetch --tags https://github.com/RebacaInc/abot_charm.git $ABOT_CHARM && \
-        git checkout FETCH_HEAD) && \
-    python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-        juju-wait==$JUJU_WAIT_TAG && \
-    go get -d github.com/rogpeppe/godeps && \
-    (cd $GOPATH/src/github.com/rogpeppe/godeps && git checkout $GODEPS_TAG && go install -v github.com/rogpeppe/godeps) && \
-    go get -d -v github.com/juju/juju/... || true && \
-    (cd $GOPATH/src/github.com/juju/juju && git checkout $JUJU_TAG && godeps -u dependencies.tsv) && \
-    go install -v github.com/juju/juju/... && \
-    rm -r $GOPATH/src/ $GOPATH/pkg && \
+    case "$(uname -m)" in \
+    "armv7l" | "aarch64") ;; \
+    *) \
+        git init /src/epc-requirements/abot_charm && \
+        (cd /src/epc-requirements/abot_charm && \
+            git fetch --tags https://github.com/RebacaInc/abot_charm.git $ABOT_CHARM && \
+            git checkout FETCH_HEAD) && \
+        pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
+            juju-wait==$JUJU_WAIT_TAG && \
+        go get -d github.com/rogpeppe/godeps && \
+        (cd $GOPATH/src/github.com/rogpeppe/godeps && git checkout $GODEPS_TAG && go install -v github.com/rogpeppe/godeps) && \
+        go get -d -v github.com/juju/juju/... || true && \
+        (cd $GOPATH/src/github.com/juju/juju && git checkout $JUJU_TAG && godeps -u dependencies.tsv) && \
+        go install -v github.com/juju/juju/... && \
+        rm -r $GOPATH/src/ $GOPATH/pkg /src/epc-requirements/abot_charm/.git /root/.cache/go-build;; \
+    esac && \
     (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && bundle update rest-client) && \
     rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vims-test/.git /src/cloudify_vims/.git /src/heat_vims/.git /src/vims-test/quaff/.git \
         /src/vims-test/build-infra/.git /src/opnfv-vnf-vyos-blueprint/.git \
-        /src/epc-requirements/abot_charm/.git /root/.cache/go-build \
         /tmp/clearwater-heat-singlenet-deps.patch && \
     apk del .build-deps
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]