[CI] Fix CI jobs

rally-dsvm-manila-multibackend and
rally-dsvm-manila-multibackend-no-ss were old
jobs whose definition was removed a while ago, however,
the check pipeline on this repo had these jobs
and this config error was not surfaced until
recently [1]. Replace these older jobs with the
correct ones.

The lower constraints job should only be run on
master, since it provides little value to stable branches
we've already shipped. We do not allow requirements
changes in these branches lightly. [2][3][4]

Also cherry-pick the fix for the functional
tests due to change in an experimental API
(share server migration) behavior [5]

[1] http://lists.openstack.org/pipermail/openstack-discuss/2021-November/025797.html
[2] http://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html
[3] https://pip.pypa.io/en/stable/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020
[4] http://lists.openstack.org/pipermail/openstack-discuss/2021-March/021204.html
[5] I7d53a65f1a3b1d5112b3e4de7dc60925191920fa
Change-Id: I4a7de404bd02887e7a7b37fff8ce449846109cbb
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
(cherry picked from commit 1f72195d31)
This commit is contained in:
Goutham Pacha Ravi 2021-12-14 11:34:56 -08:00
parent 1af5987832
commit 406ae1c65e
2 changed files with 16 additions and 7 deletions

View File

@ -317,20 +317,30 @@ class ShareServersMigrationBase(base.BaseTestCase):
task_state = constants.TASK_STATE_MIGRATION_DRIVER_PHASE1_DONE
server = self.admin_client.wait_for_server_migration_task_state(
share_server_id, dest_host, task_state)
migration_progress = (
self.admin_client.share_server_migration_get_progress(
share_server_id))
dest_share_server_id = migration_progress.get(
'destination_share_server_id')
# Call share server migration complete or cancel operations
# according the ddt.
if operation == 'complete':
task_state = constants.TASK_STATE_MIGRATION_SUCCESS
self.admin_client.share_server_migration_complete(
share_server_id)
task_state = constants.TASK_STATE_MIGRATION_SUCCESS
server = self.admin_client.wait_for_server_migration_task_state(
dest_share_server_id, dest_host, task_state)
self.assertRaises(exceptions.NotFound,
self.admin_client.get_share_server,
share_server_id)
else:
self.admin_client.share_server_migration_cancel(server['id'])
task_state = constants.TASK_STATE_MIGRATION_CANCELLED
# Wait for the respectives task state for each operation above.
server = self.admin_client.wait_for_server_migration_task_state(
server['id'], dest_host, task_state)
# Wait for the respectives task state for each operation above.
server = self.admin_client.wait_for_server_migration_task_state(
server['id'], dest_host, task_state)
# Check if the share is available again.
share = self.admin_client.get_share(share['id'])
self.assertEqual('available', share['status'])

View File

@ -2,16 +2,15 @@
templates:
- publish-openstack-docs-pti
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- openstack-python3-xena-jobs
- check-requirements
- release-notes-jobs-python3
check:
jobs:
- python-manilaclient-functional
- rally-dsvm-manila-multibackend:
- manila-rally-ss:
voting: false
- rally-dsvm-manila-multibackend-no-ss:
- manila-rally-no-ss:
voting: false
gate:
jobs: