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/tempest/Dockerfile | |
| 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/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 87793cd8e..edbe748a2 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -5,37 +5,31 @@ ARG OPENSTACK_TAG=stable/rocky ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf ARG RALLY_TAG=1.3.0 ARG RALLY_OPENSTACK_TAG=1.3.0 -ARG OS_FAULTS_TAG=0.1.18 ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd 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 && \ sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ 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/os-faults && \ - (cd /src/os-faults && \ - git fetch --tags https://git.openstack.org/openstack/os-faults.git $OS_FAULTS_TAG && \ - git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ git init /src/rally && \ (cd /src/rally && \ - git fetch --tags https://git.openstack.org/openstack/rally.git $RALLY_TAG && \ + git fetch --tags https://opendev.org/openstack/rally.git $RALLY_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ git init /src/rally-openstack && \ (cd /src/rally-openstack && \ - git fetch --tags https://git.openstack.org/openstack/rally-openstack.git $RALLY_OPENSTACK_TAG && \ + git fetch --tags https://opendev.org/openstack/rally-openstack.git $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 && \ + tempest /src/rally-openstack && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/rally && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/os-faults /src/rally /src/rally-openstack && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/rally /src/rally-openstack && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ |