From c42a099fef7bde2f41e4c6235cff145b5c8366fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 27 Jun 2025 17:15:45 +0200 Subject: [PATCH] Skip 3 buggy Patrole tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit cc87fa14676fe45aac2a001d76e112fdbcfa0692) (cherry picked from commit 7f9759b3bdd7c7dc93df8b333b498fae0de6b175) --- docker/benchmarking/Dockerfile | 2 +- docker/core/Dockerfile | 4 +++- docker/healthcheck/Dockerfile | 2 +- docker/smoke/Dockerfile | 12 ++++++------ docker/smoke/testcases.yaml | 9 +++++++++ docker/vnf/Dockerfile | 4 ++-- tox.ini | 2 +- upper-constraints.txt | 5 +++-- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index bb9649a24..4b37d2bb3 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core:zed ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc -ARG NEUTRON_TAG=stable/zed +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 4f47b0d74..786fc7eab 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.16 ARG BRANCH=stable/zed -ARG OPENSTACK_TAG=stable/zed +ARG OPENSTACK_TAG=unmaintained/zed 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 @@ -26,6 +26,8 @@ RUN apk -U upgrade && \ sed -i -E /^PyYAML==+.*$/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 257984161..7ae2a1ab2 100644 --- 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 7695701e0..2c2b29704 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,11 +4,11 @@ ARG PATROLE_TAG=0.15.0 ARG NEUTRON_TEMPEST_TAG=2.0.0 ARG CINDER_TEMPEST_TAG=1.7.2 ARG KEYSTONE_TEMPEST_TAG=0.10.0 -ARG NEUTRON_TAG=stable/zed -ARG GLANCE_TAG=stable/zed -ARG NOVA_TAG=stable/zed -ARG KEYSTONE_TAG=stable/zed -ARG CINDER_TAG=stable/zed +ARG NEUTRON_TAG=unmaintained/zed +ARG GLANCE_TAG=unmaintained/zed +ARG NOVA_TAG=unmaintained/zed +ARG KEYSTONE_TAG=unmaintained/zed +ARG CINDER_TAG=unmaintained/zed ARG BARBICAN_TAG=1.7.0 ARG OCTAVIA_TAG=2.0.0 ARG HEAT_TEMPEST_TAG=1.6.0 @@ -18,7 +18,7 @@ ARG CYBORG_TEMPEST_TAG=2.0.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 77bee5704..0436f5511 100644 --- 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 970b54345..de99f884c 100644 --- 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 a766e2246..ee38901f7 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,bashate,bandit,py310,cover,perm,pre-commit usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/zed/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/unmaintained/zed/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install --use-deprecated=legacy-resolver {opts} {packages} diff --git a/upper-constraints.txt b/upper-constraints.txt index da2aeab64..f7dd2f6a4 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -9,8 +9,8 @@ bandit===1.7.5 bandit===1.7.0 ruamel.yaml.jinja2==0.2.2 -e git+https://opendev.org/openstack/tempest@30.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@b8591ec366293d60735536f95f0d09a8c18916ca#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 @@ -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 -- 2.16.6