diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-19 14:36:46 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-19 17:03:26 +0200 |
| commit | 7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b (patch) | |
| tree | a32738075be8d7112e0a647f71a952ca83c7a39d /docker/vnf | |
| parent | 019cd1506aba1dfe2c73e7ddeb5de8f4af6d4cd9 (diff) | |
Add functest in upper-constraints
It's required by OPNFV Features such as sfc.
Functest is removed from constraints in Dockerfile else it would
conflict with the local dir.
Change-Id: I2df5cd151b43eb1a4f0320510183d0f28cdf84c3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 09c8413db..eb4a3d002 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -20,6 +20,8 @@ RUN apk --no-cache add --update \ 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 && \ + wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ + sed -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 && \ sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \ git clone https://github.com/Metaswitch/quaff /src/vims-test/quaff && \ @@ -28,8 +30,7 @@ RUN apk --no-cache add --update \ 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 && \ - python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ juju-wait && \ go get github.com/rogpeppe/godeps && \ go get -d -v github.com/juju/juju/... || true && \ @@ -37,7 +38,7 @@ 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/vims-test/quaff/.git \ + rm -r upper-constraints.txt upper-constraints.opnfv.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 |