Skip to content

Commit 31d92c2

Browse files
amoralejopenshift-merge-bot[bot]
authored andcommitted
Bump watcher-tempest-plugin for epoxy jobs to known good commit
Currently, watcher-tempest-plugin is pinned in RDO to tag 3.4.0 [1]. Some fixes and improvements have been merged since then and the required backports in the watcher epoxy branch are merged, so let's bump the tempest plugin. Given that in the past it has been usual that patches in master branch of the plugin requires backports in the watcher epoxy branch, I am not proposing to follow the master branch of the plugin but using a known good commit. I'm disabling one zone_migration test which requires [2] to be merged. [1] https://github.com/redhat-openstack/rdoinfo/blob/ee923461f857154321314796ed06c8365c1457d0/tags/epoxy.yml#L943-L946 [2] https://review.opendev.org/c/openstack/watcher/+/951535 Signed-off-by: Alfredo Moralejo <[email protected]>
1 parent 54429ff commit 31d92c2

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

.zuul.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
cifmw_test_operator_tempest_image_tag: watcher_latest
180180
# Max api microversion for epoxy release
181181
watcher_tempest_max_microversion: "1.4"
182+
# Use watcher-tempest-plugin from known-compatible commit to current status of epoxy branch
183+
cifmw_test_operator_tempest_external_plugin:
184+
- repository: "https://opendev.org/openstack/watcher-tempest-plugin.git"
185+
changeRepository: "https://review.opendev.org/openstack/watcher-tempest-plugin"
186+
changeRefspec: "380572db57798530b64dcac14c6b01b0382c5d8e"
182187

183188
- job:
184189
name: watcher-operator-validation-epoxy-ocp4-16

ci/tests/watcher-tempest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ cifmw_test_operator_tempest_include_list: |
3030
# is finished upstream.
3131
# TODO(chandankumar): Drop watcher_tempest_plugin.*client_functional.* from here and also remove it
3232
# from watcher-tempest-plugin by openstack release 2024.2 eol.
33+
# TODO(amoralej): Disable test_execute_zone_migration_without_destination_host until
34+
# https://review.opendev.org/c/openstack/watcher/+/951535 is merged
3335
cifmw_test_operator_tempest_exclude_list: |
3436
watcher_tempest_plugin.*client_functional.*
3537
watcher_tempest_plugin.tests.scenario.test_execute_strategies.TestExecuteStrategies.test_execute_storage_capacity_balance_strategy
3638
watcher_tempest_plugin.*\[.*\breal_load\b.*\].*
39+
watcher_tempest_plugin.tests.scenario.test_execute_zone_migration.TestExecuteZoneMigrationStrategy.test_execute_zone_migration_without_destination_host
3740
3841
# Tempest images cases
3942
# content_provider_os_registry_url is not null, It means an opendev depends-on is used

0 commit comments

Comments
 (0)