From b52ea7f713fd453a39bb2a1344487821d01a7d99 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 13 Mar 2018 11:08:36 +0100 Subject: Add patrole in smoke MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also removes the former container which had helped when checking possible regex issues. I should be noted that patrole is already part of opnfv/functest-restapi. Change-Id: I76783bc3d121dfcef5b709f21a5e474354e93705 Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docker/smoke/Dockerfile') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 85d942a1e..ad0ae9fcd 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -6,6 +6,7 @@ ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 ARG REFSTACK_TARGET=2017.09 +ARG PATROLE_TAG=0.2.0 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ @@ -21,12 +22,15 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ 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/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ tempest /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 -rthirdparty-requirements.txt && \ + /src/rally /src/patrole -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 && \ @@ -38,6 +42,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 && \ + mkdir -p /etc/neutron /etc/glance && \ + wget -q -O /etc/neutron/policy.json https://raw.githubusercontent.com/openstack/neutron/$OPENSTACK_TAG/etc/policy.json && \ + wget -q -O /etc/glance/policy.json https://raw.githubusercontent.com/openstack/glance/$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"] -- cgit 1.2.3-korg