Add patrole in smoke

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 <cedric.ollivier@orange.com>

diff --git a/docker/patrole/Dockerfile b/docker/patrole/Dockerfile
deleted file mode 100644 (file)
index 959e44f..0000000
--- a/docker/patrole/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM opnfv/functest-core
-
-ARG BRANCH=master
-ARG PATROLE_TAG=0.2.0
-ARG OPENSTACK_TAG=stable/pike
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
-
-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 | \
-        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 --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
-    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 \
-        oslotest /src/patrole /src/rally && \
-    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 && \
-    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 && \
-    rm -r upper-constraints.txt /src/os-faults /src/rally && \
-    apk del .build-deps
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
-CMD ["run_tests", "-t", "all"]

diff --git a/docker/patrole/hooks/post_checkout b/docker/patrole/hooks/post_checkout
deleted file mode 100644 (file)
index 8d0e981..0000000
--- a/docker/patrole/hooks/post_checkout
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
-sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
-
-exit $?

diff --git a/docker/patrole/testcases.yaml b/docker/patrole/testcases.yaml
deleted file mode 100644 (file)
index 4d4b4c6..0000000
--- a/docker/patrole/testcases.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-tiers:
-    -
-        name: smoke
-        order: 1
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:
-            -
-                case_name: patrole
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    Test suite from Patrole project.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.patrole.patrole'
-                    class: 'Patrole'
-                    args:
-                        role: 'admin'
-                        services:
-                            - 'image'
-                            - 'network'
-                            - 'volume'
-                        exclude:
-                            - 'test_networks_multiprovider_rbac'

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 85d942a..ad0ae9f 100644 (file)
--- 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"]

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 62ac80a..9f017e5 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -87,6 +87,28 @@ tiers:
                         'functest.opnfv_tests.openstack.refstack.refstack'
                     class: 'Refstack'
 
+            -
+                case_name: patrole
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test suite from Patrole project.
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.patrole.patrole'
+                    class: 'Patrole'
+                    args:
+                        role: 'admin'
+                        services:
+                            - 'image'
+                            - 'network'
+                            - 'volume'
+                        exclude:
+                            - 'test_networks_multiprovider_rbac'
+
             -
                 case_name: odl
                 project_name: functest