From: Cédric Ollivier Date: Tue, 18 Dec 2018 14:59:23 +0000 (+0100) Subject: Allow pulling Neutron reviews or tags X-Git-Tag: opnfv-8.1.0~102 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F65949%2F1;p=functest.git Allow pulling Neutron reviews or tags It updates smoke/Dockerfile to allow pulling Neutron reviews/tags (rally_jobs). Change-Id: Ifc10eebb444bfe2c3e1fb47a9bd52d8a4f8a7007 Signed-off-by: Cédric Ollivier (cherry picked from commit 2d0c8cb6eaf10b7c712335beb79fae726ea3a965) --- diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 32f65aee5..8b6bc428c 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -42,8 +42,10 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /etc/neutron /etc/glance && \ wget -q -O /etc/neutron/policy.json https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=$OPENSTACK_TAG && \ wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \ - git clone --depth 1 -b $NEUTRON_RALLY_TAG https://git.openstack.org/openstack/neutron.git /src/neutron && \ - (cd /src/neutron && git fetch --tags origin $NEUTRON_RALLY_TAG && git checkout FETCH_HEAD) && \ + git init /src/neutron && \ + (cd /src/neutron && \ + git fetch --tags https://git.openstack.org/openstack/neutron.git $NEUTRON_RALLY_TAG && \ + git checkout FETCH_HEAD) && \ mkdir -p /home/opnfv/functest/data/rally/neutron && \ cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ rm -r /src/neutron && \