diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
| commit | 7fcc3662120b04b2c76ca40d8c4c660a2110b615 (patch) | |
| tree | 8ea218c7d6f846d31c7ab11e3b72f55bbc223f62 /docker/smoke/Dockerfile | |
| parent | d338103023b7d59f1a23200dafcf28c40a0d3d36 (diff) | |
Bypass upstream requirement issues
https://review.opendev.org/#/c/708041/
Change-Id: Iebbf0a720fe9d1c62083028d0bc0078bf7680753
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 9426fd4a4..38dda05a6 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,11 +1,13 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=1843927ab31a6cc8b4313f786175da3ea2767a00 ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master ARG CINDER_TEMPEST_TAG=master ARG KEYSTONE_TEMPEST_TAG=master +ARG NEUTRON_TAG=master +ARG GLANCE_TAG=master ARG BARBICAN_TAG=master ARG OCTAVIA_TAG=master @@ -13,7 +15,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ - wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/commit/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ @@ -57,8 +59,8 @@ RUN apk --no-cache add --update libxml2 libxslt && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - oslo.policy -e git+https://opendev.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron \ - -e git+https://opendev.org/openstack/glance.git@$OPENSTACK_TAG#egg=glance && \ + oslo.policy -e git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \ + -e git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance && \ oslopolicy-sample-generator --format json --output-file /etc/neutron/policy.json --namespace neutron && \ oslopolicy-sample-generator --format json --output-file /etc/glance/policy.json --namespace glance && \ deactivate && \ |