Temporarily disable rally_jobs and patrole subtests

The public network now seems hardcoded (public) [1] which doesn't
fit the OPNFV model [2]. Neutron also stops publishing policy.json
[3].

Upstream files have to be updated or fixed in Functest.

[1] http://artifacts.opnfv.org/functest/opnfv-functest-smoke-rally_jobs-latest-run-25/functest.log
[2] https://review.openstack.org/#/c/620952/
[3] https://review.openstack.org/#/c/585037/

Change-Id: Ibae4ce71a45afa3ed4a987577937220b8a3a89f9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 303f9a5..df5f2c2 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -40,7 +40,6 @@ RUN apk --no-cache add --virtual .build-deps --update \
     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://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=$OPENSTACK_TAG && \
     wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
     git clone --depth 1 -b $NEUTRON_RALLY_TAG https://git.openstack.org/openstack/neutron.git /src/neutron && \
     (cd /src/neutron && git fetch --tags origin $NEUTRON_RALLY_TAG && git checkout FETCH_HEAD) && \

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 55f7a10..d4e2ef1 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -55,6 +55,7 @@ tiers:
             -
                 case_name: rally_jobs
                 project_name: functest
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -90,7 +91,6 @@ tiers:
                         role: 'admin'
                         includes:
                             - 'image'
-                            - 'network'
                         excludes:
                             - 'test_networks_multiprovider_rbac'
                             - 'test_auto_allocated_topology_rbac'

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 095e2f9..e209e1f 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -227,6 +227,7 @@ tiers:
             -
                 case_name: rally_jobs
                 project_name: functest
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -262,7 +263,6 @@ tiers:
                         role: 'admin'
                         includes:
                             - 'image'
-                            - 'network'
                         excludes:
                             - 'test_networks_multiprovider_rbac'
                             - 'test_auto_allocated_topology_rbac'