From 38d3c2fb1e4ecbea5ad2d4245d658a608db3a65e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 19 Apr 2019 20:13:38 +0200 Subject: Build arm* functest-vnf containers via travis-ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It doesn't build juju deps if arm* as they can't be cross-compiled. Then that deps won't be built in releng on native arm64 hosts It's worth mentioning that containers have never been executed in OPNFV gates. That change allows running all other VNFs on Raspberry PI and building containers without arm build servers. Change-Id: I836a72f049e7f0e6ae704f5b829914692d5b2c09 Signed-off-by: Cédric Ollivier (cherry picked from commit 0c3ae6e09acd16fc50a516975631dd6bb76b8c53) --- docker/vnf/Dockerfile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'docker') diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index f1e8455cf..76937a2f9 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -56,22 +56,25 @@ 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) && \ + 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 /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 -- cgit 1.2.3-korg