diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-31 16:02:02 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-02 15:54:09 +0200 |
| commit | 6079de9abe8af32f94fbdc40edc58fbc07a0dfe4 (patch) | |
| tree | ad13f7e3135a73d4e40ea21bee9a26beeb0ddbb5 | |
| parent | 3545d54a9ac4713d44168c800b171b8186fb4371 (diff) | |
Allow refs as vnf requirement versions
Change-Id: I4079fa3641373eee40f8a876a2a525635f2752eb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b039d8d4219bca73a5b86e03f34f27fbe655ec81)
| -rw-r--r-- | docker/vnf/Dockerfile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index b17ad2b9e..07aeca0aa 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -9,6 +9,7 @@ ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 ARG ABOT_TAG=opnfv-fraser ARG JUJU_WAIT_TAG=2.6.4 +ARG ABOT_CHARM=opnfv-fraser ENV GOPATH /src/epc-requirements/go ENV GOBIN /src/epc-requirements/go/bin @@ -26,11 +27,14 @@ RUN apk --no-cache add --update \ 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 && \ (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 $CLOUDIFY_VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \ + git clone --depth 1 https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \ + (cd /src/vims-test/build-infra && git fetch --depth 1 --tags origin $VIMS_TEST_TAG && git checkout FETCH_HEAD) && \ + git clone --depth 1 https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \ + (cd /src/cloudify_vims && git fetch --depth 1 --tags origin $CLOUDIFY_VIMS_TAG && git checkout FETCH_HEAD) && \ 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 && \ - (cd /src/epc-requirements/abot_charm && git checkout $ABOT_TAG) && \ + (cd /src/opnfv-vnf-vyos-blueprint && git fetch --depth 1 --tags origin $VROUTER_TAG && git checkout FETCH_HEAD) && \ + git clone --depth 1 https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ + (cd /src/epc-requirements/abot_charm && git fetch --depth 1 --tags origin $ABOT_CHARM && git checkout FETCH_HEAD) && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ juju-wait==$JUJU_WAIT_TAG && \ |