Skip 3 buggy Patrole tests

patrole_tempest_plugin.tests.api.volume.test_volume_actions_rbac.VolumesActionsV3RbacTest.test_attach_volume_to_instance
patrole_tempest_plugin.tests.api.volume.test_volume_actions_rbac.VolumesActionsV3RbacTest.test_detach_volume_from_instance
patrole_tempest_plugin.tests.api.volume.test_volume_actions_rbac.VolumesActionsV3RbacTest.test_force_detach_volume_from_instance

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

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index eabf35f..6469004 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core:xena
 
 ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc
-ARG NEUTRON_TAG=stable/xena
+ARG NEUTRON_TAG=unmaintained/zed
 
 RUN apk --no-cache add --update libxml2 libxslt && \
     apk --no-cache add --virtual .build-deps --update \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 3a63a2f..df51b75 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.14
 
 ARG BRANCH=stable/xena
-ARG OPENSTACK_TAG=stable/xena
+ARG OPENSTACK_TAG=unmaintained/xena
 
 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
 COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch
@@ -31,6 +31,8 @@ RUN apk -U upgrade && \
     sed -i -E /^packaging=/d /src/requirements/upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
     sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
+    pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
+        pyyaml --no-build-isolation && \
     pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
         -e /src/requirements && \
     update-requirements -s --source /src/requirements /src/functest && \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index a1e37b0..d8bc738 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -7,7 +7,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev openssl-dev && \
     git init /src/odl_test && \
     (cd /src/odl_test && \
-        git fetch --tags https://git.opendaylight.org/gerrit/integration/test $ODL_TAG && \
+        git fetch --tags https://github.com/opendaylight/integration-test $ODL_TAG && \
         git checkout FETCH_HEAD) && \
     rm -r /src/odl_test/.git thirdparty-requirements.txt && \
     apk del .build-deps

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index f79b10e..0158870 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -4,11 +4,11 @@ ARG PATROLE_TAG=0.13.0
 ARG NEUTRON_TEMPEST_TAG=1.7.0
 ARG CINDER_TEMPEST_TAG=1.5.0
 ARG KEYSTONE_TEMPEST_TAG=0.8.0
-ARG NEUTRON_TAG=stable/xena
-ARG GLANCE_TAG=stable/xena
-ARG NOVA_TAG=stable/xena
-ARG KEYSTONE_TAG=stable/xena
-ARG CINDER_TAG=stable/xena
+ARG NEUTRON_TAG=unmaintained/xena
+ARG GLANCE_TAG=unmaintained/xena
+ARG NOVA_TAG=unmaintained/xena
+ARG KEYSTONE_TAG=unmaintained/xena
+ARG CINDER_TAG=unmaintained/xena
 ARG BARBICAN_TAG=1.5.0
 ARG OCTAVIA_TAG=1.8.1
 ARG HEAT_TEMPEST_TAG=1.4.0
@@ -18,7 +18,7 @@ ARG CYBORG_TEMPEST_TAG=1.3.0
 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 && \
+        openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev autoconf automake && \
     case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \
         pip3 install --use-deprecated=legacy-resolver --no-cache-dir -c/src/requirements/upper-constraints.txt \
         -c/src/functest/upper-constraints.txt lxml && \

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 8264662..4c58a1f 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -233,6 +233,9 @@ tiers:
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_delete_group_type)\
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_update_group_type)\
                           (?!.*test_quota_classes_rbac)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_attach_volume_to_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_detach_volume_from_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_force_detach_volume_from_instance)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_delete_volume_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_list_volumes_details_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_show_volume_details_image_metadata)\
@@ -269,6 +272,9 @@ tiers:
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_delete_group_type)\
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_update_group_type)\
                           (?!.*test_quota_classes_rbac)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_attach_volume_to_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_detach_volume_from_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_force_detach_volume_from_instance)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_delete_volume_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_list_volumes_details_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_show_volume_details_image_metadata)\
@@ -305,6 +311,9 @@ tiers:
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_delete_group_type)\
                           (?!.*test_groups_rbac.GroupTypesV3RbacTest.test_update_group_type)\
                           (?!.*test_quota_classes_rbac)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_attach_volume_to_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_detach_volume_from_instance)\
+                          (?!.*test_volume_actions_rbac.VolumesActionsV3RbacTest.test_force_detach_volume_from_instance)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_delete_volume_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_list_volumes_details_image_metadata)\
                           (?!.*test_volume_metadata_rbac.VolumeMetadataV3RbacTest.test_show_volume_details_image_metadata)\

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 92c925d..1486883 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -5,7 +5,7 @@ ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
 ARG CLOUDIFY_VIMS_TAG=gambia
 ARG HEAT_VIMS_TAG=release-130
 ARG VROUTER_TAG=fraser
-ARG VROUTER_BP_TAG=9b76d46a388d32d4985797620e67c2ed3315b3e4
+ARG VROUTER_BP_TAG=8a6d3eb9f6e5e9f387e16507971462bfa7514700
 ARG ABOT_CHARM=opnfv-fraser
 
 COPY clearwater-heat-singlenet-deps.patch /tmp/clearwater-heat-singlenet-deps.patch
@@ -38,7 +38,7 @@ RUN apk --no-cache add --update \
         patch -p1 < /tmp/clearwater-heat-singlenet-deps.patch) && \
     git init /src/opnfv-vnf-vyos-blueprint && \
     (cd /src/opnfv-vnf-vyos-blueprint && \
-        git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_BP_TAG && \
+        git fetch --tags https://github.com/collivier/opnfv-vnf-vyos-blueprint $VROUTER_BP_TAG && \
         git checkout FETCH_HEAD) && \
     mkdir -p /home/opnfv/functest/data/router && \
     git init /home/opnfv/functest/data/router/opnfv-vnf-data && \

diff --git a/tox.ini b/tox.ini
index bbf19b3..6d842cf 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,bashate,bandit,py39,cover,perm
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/xena/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/unmaintained/xena/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}

diff --git a/upper-constraints.txt b/upper-constraints.txt
index c88e87b..97398b2 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -9,8 +9,8 @@ git+https://github.com/PyCQA/bandit@3d0824676974e7e2e9635c10bc4f12e261f1dbdf#egg
 bandit===1.7.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest@29.0.0#egg=tempest
--e git+https://opendev.org/openstack/rally.git@3.3.0#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git@1c470d56f4dd63374f41f7b243092b0a0751a22f#egg=rally-openstack
+-e git+https://opendev.org/openstack/rally.git@3.4.0#egg=rally
+git+https://opendev.org/openstack/rally-openstack.git@2.3.0#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@2ffa85af2bff3438b6b23034b6ec6ee1de481090#egg=xrally-kubernetes
 pylint===2.11.1
 flake8===4.0.1
@@ -19,3 +19,4 @@ ruamel.yaml===0.17.17
 sphinxcontrib-spelling===4.3.0
 ansible-lint===5.2.1
 setuptools_scm===6.3.2
+os-faults==0.2.7