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/tempest | |
| 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/tempest')
| -rw-r--r-- | docker/tempest/Dockerfile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index dc9c9dede..dc142f456 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -12,25 +12,25 @@ RUN apk --no-cache add --virtual .build-deps --update \ case $OPENSTACK_TAG in \ master) \ 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#egg=tempest/ \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \ > upper-constraints.txt ;; \ *) \ 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 ;; \ esac && \ 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 \ - -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ - git clone https://github.com/openstack/os-faults.git /src/os-faults && \ - (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \ + -e git+https://git.openstack.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ + git clone --depth 1 https://git.openstack.org/openstack/os-faults.git /src/os-faults && \ + (cd /src/os-faults && git fetch --tags origin $OS_FAULTS_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ - git clone https://github.com/openstack/rally.git /src/rally && \ - (cd /src/rally && git checkout $RALLY_TAG) && \ + git clone --depth 1 https://git.openstack.org/openstack/rally.git /src/rally && \ + (cd /src/rally && git fetch --tags origin $RALLY_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ - git clone https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ - (cd /src/rally-openstack && git checkout $RALLY_OPENSTACK_TAG) && \ + git clone --depth 1 https://git.openstack.org/openstack/rally-openstack.git /src/rally-openstack && \ + (cd /src/rally-openstack && git fetch --tags origin $RALLY_OPENSTACK_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ tempest /src/rally-openstack /src/os-faults && \ |