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>
(cherry picked from commit cc87fa14676fe45aac2a001d76e112fdbcfa0692)
(cherry picked from commit 7f9759b3bdd7c7dc93df8b333b498fae0de6b175)

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 2715cce..f03e971 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -25,6 +25,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 404ff2d..9ca3d73 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 da42ef9..d79b742 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -18,7 +18,7 @@ ARG CYBORG_TEMPEST_TAG=master
 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 77bee57..0436f55 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -239,6 +239,9 @@ tiers:
                           (?!.*test_user_messages_rbac)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV310RbacTest)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV312RbacTest)\
+                          (?!.*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)\
@@ -285,6 +288,9 @@ tiers:
                           (?!.*test_user_messages_rbac)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV310RbacTest)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV312RbacTest)\
+                          (?!.*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)\
@@ -331,6 +337,9 @@ tiers:
                           (?!.*test_user_messages_rbac)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV310RbacTest)\
                           (?!.*test_volume_actions_rbac.VolumesActionsV312RbacTest)\
+                          (?!.*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 99f848f..c25fb49 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/upper-constraints.txt b/upper-constraints.txt
index 5eff3d2..998bcbb 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -9,9 +9,9 @@ bandit===1.7.5
 bandit===1.7.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest#egg=tempest
--e git+https://opendev.org/openstack/rally.git#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack
-git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes
+-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
 pytest===7.1.2
@@ -22,3 +22,4 @@ sphinxcontrib-spelling===4.3.0
 ansible-lint===5.2.1
 setuptools_scm===6.3.2
 pre-commit===3.1.1
+os-faults==0.2.7