diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-01 17:56:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-01 17:56:50 +0000 |
| commit | 1b299d38acb223caa21d0c3eeb32c9d2ae348a1c (patch) | |
| tree | 472a75baa9d25d3022db2edb45300befe0beed54 /docker/healthcheck | |
| parent | 7d846e202c8f3d596a419dc0367c144e864a1a86 (diff) | |
| parent | b039d8d4219bca73a5b86e03f34f27fbe655ec81 (diff) | |
Merge changes I4079fa36,I3ad7a38e
* changes:
Allow refs as vnf requirement versions
Avoid downloading git history
Diffstat (limited to 'docker/healthcheck')
| -rw-r--r-- | docker/healthcheck/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index e78d81c52..004aa5da0 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -6,14 +6,14 @@ ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN 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/ \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/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 && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ -rthirdparty-requirements.txt && \ - git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ - (cd /src/odl_test && git checkout $ODL_TAG) && \ + git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + (cd /src/odl_test && git fetch --tags origin $ODL_TAG && git checkout FETCH_HEAD) && \ rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \ upper-constraints.opnfv.txt COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml |