diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml index 6d786fd8..6f158e84 100644 --- a/zuul.d/manila-tempest-jobs.yaml +++ b/zuul.d/manila-tempest-jobs.yaml @@ -47,7 +47,6 @@ MANILA_SERVER_MIGRATION_PERIOD_TASK_INTERVAL: 10 MANILA_REPLICA_STATE_UPDATE_INTERVAL: 10 - - job: name: manila-tempest-plugin-ipv6-base abstract: true diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml index aa33c160..1b73d121 100644 --- a/zuul.d/manila-tempest-stable-jobs.yaml +++ b/zuul.d/manila-tempest-stable-jobs.yaml @@ -1,5 +1,5 @@ -# Stable branch jobs to test the trunk version of manila-tempest-plugin against -# released stable branches of manila +# Stable wallaby / xena / yoga branch jobs to test the trunk version of +# manila-tempest-plugin against those released stable branches of manila - job: name: manila-tempest-plugin-generic-scenario-stable @@ -7,7 +7,7 @@ Test the scenario test cases on the generic driver multibackend (DHSS=True) with NFS and CIFS parent: manila-tempest-plugin-generic-scenario-base - branches: &manila_tempest_image_pinned_branches ^(stable/(yoga|xena|wallaby|victoria|ussuri)).*$ + branches: &manila_tempest_image_pinned_branches ^(stable/(yoga|xena|wallaby)).*$ vars: &manila_tempest_image_pinned_vars devstack_localrc: # NOTE(carloss): Pinning manila service image to a Focal version,