From 13b0e1cbcd873664e3d93dab42d3bff6caaf3e76 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 17 Jun 2018 09:53:13 +0200 Subject: Leverage on new opnfv/functest-tempest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It simplifies components, features and smoke containers and they can now leverage on tempest. Change-Id: Ie5564b8ba8a58670827af74371194d2583801f1b Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'docker/smoke') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 9bb98be4a..c778772e6 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,10 +1,8 @@ -FROM opnfv/functest-core +FROM opnfv/functest-tempest ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 -ARG RALLY_TAG=0.11.2 -ARG OS_FAULTS_TAG=0.1.17 ARG REFSTACK_TARGET=2017.09 ARG PATROLE_TAG=0.3.0 @@ -15,36 +13,19 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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/ \ > upper-constraints.txt && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ - git clone https://github.com/openstack/os-faults.git /src/os-faults && \ - (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \ - update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ - git clone https://github.com/openstack/rally.git /src/rally && \ - (cd /src/rally && git checkout $RALLY_TAG) && \ - update-requirements -s --source /src/openstack-requirements /src/rally/ && \ git clone https://github.com/openstack/patrole.git /src/patrole && \ (cd /src/patrole && git checkout $PATROLE_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ git clone --depth 1 https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ - git clone --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ - update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - tempest /src/rally-openstack /src/os-faults && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - /src/rally /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \ + /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd /src/odl_test && git checkout $ODL_TAG) && \ virtualenv --system-site-packages /src/tempest/.venv && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \ - /src/os-faults /src/rally /src/rally-openstack /src/neutron-tempest-plugin && \ - 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 && \ + /src/patrole /src/neutron-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ 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 && \ -- cgit 1.2.3-korg