diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-09 10:53:41 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-09 17:38:15 +0200 |
| commit | 37418f221837ac31f222ca3b4bd4c2e7ca9b0484 (patch) | |
| tree | e32b5008ba86c09965df41a8b361e6a023a3fbdd /docker/vnf | |
| parent | a7e9a1db5e6240b54c0b62defc43cafc6c99e490 (diff) | |
Stop using a forked obsolete repo
It leverages on the official clearwater live test instead.
It now parses the output directly.
Conflicts:
docker/vnf/Dockerfile
Change-Id: Ia7746c13362323daf72b3536d294401f0b7ae42f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 0c55898253147b8fb6e5ef1afbf6f462a5b343b5)
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 37fe364da..bd37990fd 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -2,7 +2,8 @@ FROM opnfv/functest-core:fraser ARG BRANCH=stable/fraser ARG OPENSTACK_TAG=stable/pike -ARG VIMS_TEST_TAG=stable +ARG VIMS_TEST_TAG=release-129 +ARG QUAFF_TAG=a6d9a184f03af5d8831ca4631c98dee0de60441c ARG VIMS_TAG=fraser ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 @@ -16,11 +17,14 @@ RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ 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 && \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \ 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_TEST_TAG https://github.com/boucherv-orange/clearwater-live-test.git /src/vims-test && \ + git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \ + git clone https://github.com/rkd91/quaff /src/vims-test/quaff && \ + (cd /src/vims-test/quaff && git checkout $QUAFF_TAG) && \ + git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \ git clone --depth 1 -b $VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/vims && \ git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \ git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ @@ -34,7 +38,8 @@ RUN apk --no-cache add --update \ go install -v github.com/juju/juju/... && \ rm -rf $GOPATH/go/src/ $GOPATH/pkg && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ - rm -r upper-constraints.txt /src/vims-test/.git /src/vims/.git /src/opnfv-vnf-vyos-blueprint/.git \ + rm -r upper-constraints.txt /src/vims-test/.git /src/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 && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml |