From 3f9adc62e5c659c958ca164af337e94e592ed31f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 14 Jun 2020 12:51:22 +0200 Subject: Clone repositories instead of wgetting constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It stops leveraging on wget to get constraints as it fails since opendev was created. Then functest and requirements are no longer removed for functest-core which simplifies all child Dockerfile. It also fix the current incompatibilities in OpenStack constraints ERROR: cliff 3.2.0 has requirement cmd2!=0.8.3,<0.9.0,>=0.8.0, but you'll have cmd2 1.1.0 which is incompatible. https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L230 https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L416 Change-Id: I7c044208ef26ad047fb841710b422acb6c9f0320 Signed-off-by: Cédric Ollivier (cherry picked from commit 961b940c796871e40146b90cf19b48390310dd59) --- docker/smoke/Dockerfile | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'docker/smoke') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e34613415..0f5a0ffd3 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,7 +1,5 @@ FROM opnfv/functest-core:kali -ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=stable/ussuri ARG PATROLE_TAG=0.9.0 ARG NEUTRON_TEMPEST_TAG=1.1.0 ARG CINDER_TEMPEST_TAG=0.3.1 @@ -17,68 +15,62 @@ 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 && \ - 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 && \ - sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ - case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip3 install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ git init /src/patrole && \ (cd /src/patrole && \ git fetch --tags https://opendev.org/openstack/patrole.git $PATROLE_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ + update-requirements -s --source /src/requirements /src/patrole/ && \ git init /src/neutron-tempest-plugin && \ (cd /src/neutron-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ + update-requirements -s --source /src/requirements /src/neutron-tempest-plugin && \ git init /src/cinder-tempest-plugin && \ (cd /src/cinder-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/cinder-tempest-plugin.git $CINDER_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/cinder-tempest-plugin && \ + update-requirements -s --source /src/requirements /src/cinder-tempest-plugin && \ git init /src/keystone-tempest-plugin && \ (cd /src/keystone-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/keystone-tempest-plugin.git $KEYSTONE_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/keystone-tempest-plugin && \ + update-requirements -s --source /src/requirements /src/keystone-tempest-plugin && \ git init /src/barbican-tempest-plugin && \ (cd /src/barbican-tempest-plugin && \ 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/ && \ + update-requirements -s --source /src/requirements /src/barbican-tempest-plugin/ && \ git init /src/octavia-tempest-plugin && \ (cd /src/octavia-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/octavia-tempest-plugin.git $OCTAVIA_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/octavia-tempest-plugin && \ + update-requirements -s --source /src/requirements /src/octavia-tempest-plugin && \ git init /src/heat-tempest-plugin && \ (cd /src/heat-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/heat-tempest-plugin.git $HEAT_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/heat-tempest-plugin && \ + update-requirements -s --source /src/requirements /src/heat-tempest-plugin && \ git init /src/telemetry-tempest-plugin && \ (cd /src/telemetry-tempest-plugin && \ git fetch --tags https://git.openstack.org/openstack/telemetry-tempest-plugin.git $TELEMETRY_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/telemetry-tempest-plugin && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ + update-requirements -s --source /src/requirements /src/telemetry-tempest-plugin && \ + pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + -c/src/functest/upper-constraints.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/glance && \ 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 \ + pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + -c/src/functest/upper-constraints.txt \ 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 && \ - rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ + rm -r oslo /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ /src/octavia-tempest-plugin /src/heat-tempest-plugin \ /src/telemetry-tempest-plugin /src/neutron /src/glance && \ -- cgit 1.2.3-korg