diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-27 10:56:20 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-27 15:59:46 +0100 |
| commit | 3d49c5a1548916f3ef0cf3435dc0e9b301c2f781 (patch) | |
| tree | a4e24236fbbf67b3ec05b51de3cc67ab02a91fe3 /docker/vnf/Dockerfile | |
| parent | 34a26baa2683111dbcb3ec361d5caf5bf861a467 (diff) | |
Ensure boot order in heat_ims
Ellis publishes the shared config which mostly fails when resources are
allocated in parallel (conflict). Then nothing works when the shared
config is blank.
It still remains failures in IMS testing which are still under analysis.
Change-Id: Ic54a2a7478e07a9291c76be8ffc57f04d199421e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b0d0e945ebdff62045fe74bceacbf731f5d1abfd)
Diffstat (limited to 'docker/vnf/Dockerfile')
| -rw-r--r-- | docker/vnf/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 7712668c8..c4d90afe1 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -19,6 +19,7 @@ ENV GOPATH /src/epc-requirements/go ENV GOBIN /src/epc-requirements/go/bin ENV PATH $GOBIN:$PATH +COPY clearwater-heat-add-deps.patch /tmp/clearwater-heat-add-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 && \ @@ -46,7 +47,8 @@ RUN apk --no-cache add --update \ git init /src/heat_vims && \ (cd /src/heat_vims && \ git fetch --tags https://github.com/Metaswitch/clearwater-heat.git $HEAT_VIMS_TAG && \ - git checkout FETCH_HEAD) && \ + git checkout FETCH_HEAD && \ + patch -p1 < /tmp/clearwater-heat-add-deps.patch) && \ git init /src/opnfv-vnf-vyos-blueprint && \ (cd /src/opnfv-vnf-vyos-blueprint && \ git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_BP_TAG && \ @@ -71,7 +73,8 @@ RUN apk --no-cache add --update \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ 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 && \ + /src/epc-requirements/abot_charm/.git /root/.cache/go-build \ + /tmp/clearwater-heat-add-deps.patch && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |