aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-03 20:54:58 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-03 20:54:58 +0200
commitca3c9cf6f57c87aee8c6f0b93f70d84e3df736de (patch)
tree9f580f18278ce38110927a120842b58be8fe46e4
parent49d3a31e4015eb274e68562c6aaf7ab5be2fd1bf (diff)
Rewrite git clones
Change-Id: I04c60b6c10ccd7b7e939002505e6e43e9c98eae7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile6
-rw-r--r--docker/healthcheck/Dockerfile6
2 files changed, 8 insertions, 4 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 16a0a078..5150c393 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -5,8 +5,10 @@ ARG OPENSTACK_TAG=stable/queens
ARG OPNFV_TAG=master
RUN apk --no-cache add --update python py-pip bash git grep && \
- git clone --depth 1 https://gerrit.opnfv.org/gerrit/functest-kubernetes /src/functest-kubernetes && \
- (cd /src/functest-kubernetes && git fetch --depth 1 --tags origin $BRANCH && git checkout FETCH_HEAD) && \
+ git init /src/functest-kubernetes && \
+ (cd /src/functest-kubernetes && \
+ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \
+ git checkout FETCH_HEAD) && \
pip install \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index fe13d6e6..344ea7ff 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -8,8 +8,10 @@ RUN apk --no-cache add --update make py-pip bash git \
apk --no-cache add 'go>1.10.2' --repository http://dl-cdn.alpinelinux.org/alpine/edge/community && \
apk --no-cache add --virtual .build-deps --update \
python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
- git clone --depth 1 https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \
- (cd /src/k8s.io/kubernetes && git fetch --depth 1 --tags origin $K8S_TAG && git checkout FETCH_HEAD && \
+ git init /src/k8s.io/kubernetes && \
+ (cd /src/k8s.io/kubernetes && \
+ git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \
+ git checkout FETCH_HEAD && \
# Replace the amd64 with arm64 when building e2e.test on arm platform.
if [ "$(uname -m)" = "aarch64" ]; then sed -i "s/amd64/arm64/g" ./test/images/clusterapi-tester/pod.yaml ; fi && \
make kubectl ginkgo && \