summaryrefslogtreecommitdiffstats
path: root/docker/smoke/Dockerfile
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-09-01 17:56:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-01 17:56:50 +0000
commit1b299d38acb223caa21d0c3eeb32c9d2ae348a1c (patch)
tree472a75baa9d25d3022db2edb45300befe0beed54 /docker/smoke/Dockerfile
parent7d846e202c8f3d596a419dc0367c144e864a1a86 (diff)
parentb039d8d4219bca73a5b86e03f34f27fbe655ec81 (diff)
Merge changes I4079fa36,I3ad7a38e
* changes: Allow refs as vnf requirement versions Avoid downloading git history
Diffstat (limited to 'docker/smoke/Dockerfile')
-rw-r--r--docker/smoke/Dockerfile22
1 files changed, 11 insertions, 11 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 31b67e83f..7e4939a41 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -13,21 +13,21 @@ RUN apk --no-cache add --update libxml2 libxslt && \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
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 && \
- git clone https://github.com/openstack/patrole.git /src/patrole && \
- (cd /src/patrole && git checkout $PATROLE_TAG) && \
+ git clone --depth 1 https://git.openstack.org/openstack/patrole.git /src/patrole && \
+ (cd /src/patrole && git fetch --tags origin $PATROLE_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
- git clone https://github.com/openstack/vmtp.git /src/vmtp && \
- (cd /src/vmtp && git fetch origin $VMTP_TAG && git checkout FETCH_HEAD) && \
+ git clone https://git.openstack.org/openstack/vmtp.git /src/vmtp && \
+ (cd /src/vmtp && git fetch origin --tags $VMTP_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \
- git clone https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \
- (cd /src/neutron-tempest-plugin && git fetch origin $NEUTRON_TAG && git checkout FETCH_HEAD) && \
+ git clone https://git.openstack.org/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \
+ (cd /src/neutron-tempest-plugin && git fetch --tags origin $NEUTRON_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \
- git clone https://github.com/openstack/barbican-tempest-plugin.git /src/barbican-tempest-plugin && \
- (cd /src/barbican-tempest-plugin && git fetch origin $BARBICAN_TAG && git checkout FETCH_HEAD) && \
+ git clone https://git.openstack.org/openstack/barbican-tempest-plugin.git /src/barbican-tempest-plugin && \
+ (cd /src/barbican-tempest-plugin && git fetch --tags origin $BARBICAN_TAG && git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
/src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
@@ -38,8 +38,8 @@ RUN apk --no-cache add --update libxml2 libxslt && \
wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \
-O /home/opnfv/functest/data/refstack/defcore.txt && \
mkdir -p /etc/neutron /etc/glance && \
- wget -q -O /etc/neutron/policy.json https://raw.githubusercontent.com/openstack/neutron/$OPENSTACK_TAG/etc/policy.json && \
- wget -q -O /etc/glance/policy.json https://raw.githubusercontent.com/openstack/glance/$OPENSTACK_TAG/etc/policy.json && \
+ 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 && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]