summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-09-02 09:23:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-02 09:23:55 +0000
commit57bd36e426ef797cbc66f4031d612701671f7252 (patch)
tree7f40aea8a9716cc549cfa10df78cabebeb4c3f07
parentcdeeacd093740b87865dfbffb92c6c6d5b917d3b (diff)
parentf66d763ada605cbca98f2bdf444ee5c625003965 (diff)
Merge "Optimize fetch"
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/tempest/Dockerfile6
-rw-r--r--docker/vnf/Dockerfile10
4 files changed, 10 insertions, 10 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ef4eb4413..97e4b17e8 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -16,7 +16,7 @@ RUN apk --no-cache add --update \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
pip==$PIP_TAG && \
git clone --depth 1 https://gerrit.opnfv.org/gerrit/functest /src/functest && \
- (cd /src/functest && git fetch --tags origin $BRANCH && git checkout FETCH_HEAD) && \
+ (cd /src/functest && git fetch --depth 1 --tags origin $BRANCH && git checkout FETCH_HEAD) && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
/src/functest && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 004aa5da0..ccb61abf9 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -13,7 +13,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-rthirdparty-requirements.txt && \
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) && \
+ (cd /src/odl_test && git fetch --depth 1 --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
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index dc142f456..3c30bae5a 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -24,13 +24,13 @@ RUN apk --no-cache add --virtual .build-deps --update \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-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) && \
+ (cd /src/os-faults && git fetch --depth 1 --tags origin $OS_FAULTS_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
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) && \
+ (cd /src/rally && git fetch --depth 1 --tags origin $RALLY_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/rally/ && \
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) && \
+ (cd /src/rally-openstack && git fetch --depth 1 --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 && \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 2e2ffefb7..dfa520169 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -30,15 +30,15 @@ RUN apk --no-cache add --update \
git clone https://github.com/Metaswitch/quaff /src/vims-test/quaff && \
(cd /src/vims-test/quaff && git checkout $QUAFF_TAG) && \
git clone --depth 1 https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \
- (cd /src/vims-test/build-infra && git fetch --tags origin $VIMS_TEST_TAG && git checkout FETCH_HEAD) && \
+ (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 --tags origin $CLOUDIFY_VIMS_TAG && git checkout FETCH_HEAD) && \
+ (cd /src/cloudify_vims && git fetch --depth 1 --tags origin $CLOUDIFY_VIMS_TAG && git checkout FETCH_HEAD) && \
git clone --depth 1 https://github.com/Metaswitch/clearwater-heat.git /src/heat_vims && \
- (cd /src/heat_vims && git fetch --tags origin $HEAT_VIMS_TAG && git checkout FETCH_HEAD) && \
+ (cd /src/heat_vims && git fetch --depth 1 --tags origin $HEAT_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 && \
- (cd /src/opnfv-vnf-vyos-blueprint && git fetch --tags origin $VROUTER_TAG && git checkout FETCH_HEAD) && \
+ (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 --tags origin $ABOT_CHARM && git checkout FETCH_HEAD) && \
+ (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 -cupper-constraints.opnfv.txt \
juju-wait==$JUJU_WAIT_TAG && \
go get github.com/rogpeppe/godeps && \