Browse Source

Fix job definition as devstack-plugin-ceph is branched

As devstack-plugin-ceph is branched, we moved stable branch
jobs definition in their respective branch

- https://review.opendev.org/c/openstack/devstack-plugin-ceph/+/786308
- https://review.opendev.org/c/openstack/devstack-plugin-ceph/+/786309
- https://review.opendev.org/c/openstack/devstack-plugin-ceph/+/786310
- https://review.opendev.org/c/openstack/devstack-plugin-ceph/+/786311

But we did not cleanup the master version of job definition so that we
do not need to do it for future stable branches. When stable/xena is cut
from master the ./.zuul.yaml version of jobs in stable/xena has the stable
branches variant which is being picked up by zuul for stable branch gate
instead of their own version defined in their stable branch.

- https://zuul.opendev.org/t/openstack/build/bc088154e50440fe9a2cacf52426748a/log/zuul-info/inventory.yaml#241

And it started failing ceph job when ceph version was update for master and
same is being picked by stable branch testin so due to above branch matching
logic.

To avoid this in future when we will have stable/yoga or so we need to cleanup
this in master. Master repo will only keep the master version of jobs and no
stable branch jobs.

Other stable/rocky and older jobs will be moved to stable/stein so that we have
them there if anyone cut the branch.

Closes-Bug: #1945358
Change-Id: I7061f8d1491ff957452c9c777e40186a4e9c324e
changes/78/811478/7
Ghanshyam Mann 9 months ago
parent
commit
bf07abf7a9
  1. 87
      .zuul.yaml

87
.zuul.yaml

@ -1,68 +1,3 @@
- job:
name: devstack-plugin-ceph-tempest-base
abstract: true
parent: tempest-full
description: |
Base integration tests that runs with the ceph devstack plugin.
Former names for this job where:
* legacy-tempest-dsvm-full-devstack-plugin-ceph
* gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
The original job included support for an un-used tempest-conf.sh:
# If an in-repo configuration exists, source it. This will likely
# override DEVSTACK_GATE_TEMPEST_REGEX to further refine the set of
# tests being run.
required-projects:
- openstack/cinder-tempest-plugin
- openstack/devstack-plugin-ceph
irrelevant-files: &irrelevant-files
- ^.*\.rst$
- ^doc/.*$
- ^tox.ini$
timeout: 7200
vars:
devstack_plugins:
devstack-plugin-ceph: https://opendev.org/openstack/devstack-plugin-ceph
devstack_localrc:
ENABLE_FILE_INJECTION: false
TEMPEST_PLUGINS: '/opt/stack/cinder-tempest-plugin'
ENABLE_VOLUME_MULTIATTACH: false
TEMPEST_RUN_VALIDATION: false
tox_envlist: all
tempest_test_regex: |
(^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
- job:
name: devstack-plugin-ceph-tempest
parent: devstack-plugin-ceph-tempest-base
description: |
Integration tests that runs with the ceph devstack plugin and py27.
branches:
- stable/ocata
- stable/pike
- stable/queens
- stable/rocky
vars:
devstack_localrc:
CEPH_RELEASE: "luminous"
- job:
name: devstack-plugin-ceph-tempest
parent: devstack-plugin-ceph-tempest-base
description: |
Integration tests that runs with the ceph devstack plugin and py27.
This job enable the multiattach feature enable from stein on.
# This job runs with multiattach enable from stable/stein on.
branches:
- stable/stein
- stable/train
vars:
devstack_localrc:
ENABLE_VOLUME_MULTIATTACH: true
CEPH_RELEASE: "nautilus"
- job:
name: devstack-plugin-ceph-tempest-py3-base
abstract: true
@ -77,7 +12,10 @@
required-projects:
- openstack/cinder-tempest-plugin
- openstack/devstack-plugin-ceph
irrelevant-files: *irrelevant-files
irrelevant-files: &irrelevant-files
- ^.*\.rst$
- ^doc/.*$
- ^tox.ini$
timeout: 7200
vars:
devstack_localrc:
@ -92,20 +30,6 @@
(^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
- job:
name: devstack-plugin-ceph-tempest-py3
parent: devstack-plugin-ceph-tempest-py3-base
description: |
Integration tests that runs with the ceph devstack plugin and py3.
branches:
- stable/ocata
- stable/pike
- stable/queens
- stable/rocky
vars:
devstack_localrc:
CEPH_RELEASE: "luminous"
- job:
name: devstack-plugin-ceph-tempest-py3
parent: devstack-plugin-ceph-tempest-py3-base
@ -113,9 +37,6 @@
Integration tests that runs with the ceph devstack plugin and py3.
This job enable the multiattach feature enable from stein on.
# This job runs with multiattach enable from stable/stein on.
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
vars:
devstack_localrc:
ENABLE_VOLUME_MULTIATTACH: true

Loading…
Cancel
Save