diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-04-20 01:16:48 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-04-21 13:36:04 +0200 |
| commit | 41b859ade7646ef8dad4ba75e5e4615e30213565 (patch) | |
| tree | 9422f051a4e556bb5329d9a304264550c2fb9e37 /docker/smoke | |
| parent | 12e38180a5be8604ebc5fc8e520b53b61135bbc3 (diff) | |
Update all OpenStack refs to opendev.org
All gates are failing due wrong to redirections (see os-faults [1][2]).
[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-tempest-latest-gate/96/console
[2] https://travis-ci.org/collivier/functest/builds/522071220
Change-Id: I5a8ca67f0d95df24daa9bdca2f23eb13d896f9d5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 2ceebaa032f07c4162ed3701c6814dfe5cb683d4)
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 2cfcf6a8f..acc09f7eb 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -11,13 +11,13 @@ ARG BARBICAN_TAG=0.1.0 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \ - sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ git init /src/patrole && \ (cd /src/patrole && \ - git fetch --tags https://git.openstack.org/openstack/patrole.git $PATROLE_TAG && \ + git fetch --tags https://opendev.org/openstack/patrole.git $PATROLE_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ git init /src/neutron-tempest-plugin && \ @@ -27,7 +27,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ git init /src/barbican-tempest-plugin && \ (cd /src/barbican-tempest-plugin && \ - git fetch --tags https://git.openstack.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \ + git fetch --tags https://opendev.org/openstack/barbican-tempest-plugin.git $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 \ @@ -39,8 +39,8 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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://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 && \ + wget -q -O /etc/neutron/policy.json https://opendev.org/openstack/neutron/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ + wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |