Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,16 @@
parent: s2i-test-base
# Pin the nodeset on the job so every consumer inherits it, including
# cyborg (via parent) and the s2i-component-jobs template.
nodeset: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-22-1-3xl
nodeset: centos-10-medium-2x-centos-10-crc-cloud-ocp-4-22-1-3xl
dependencies:
- openstack-k8s-operators-content-provider
- workloads-s2i-content-provider
post-run:
- ci/nova-operator-base/playbooks/collect-logs.yaml
vars:
cifmw_extras:
- "@scenarios/centos-9/multinode-ci.yml"
- "@scenarios/centos-10/base.yml"
- "@scenarios/centos-10/multinode-ci.yml"
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode/ci_fw_vars.yaml"
cifmw_run_test_role: test_operator
cifmw_test_operator_tempest_concurrency: 4
Expand Down Expand Up @@ -156,7 +157,8 @@
parent: nova-operator-tempest-multinode
vars:
cifmw_extras:
- "@scenarios/centos-9/multinode-ci.yml"
- "@scenarios/centos-10/base.yml"
- "@scenarios/centos-10/multinode-ci.yml"
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-cyborg-tempest-multinode/ci_fw_vars.yaml"
# The s2i master tempest image is inherited from
# nova-operator-tempest-multinode.
Expand All @@ -167,6 +169,7 @@
changeRefspec: "e98dfff4bacdaeffe1fa79d3cfd5f2e28002cd98"
cifmw_test_operator_tempest_include_list: |
cyborg_tempest_plugin

- job:
name: nova-operator-tempest-multinode-ceph
parent: s2i-test-base-ceph
Expand All @@ -177,8 +180,7 @@
post-run:
- ci/nova-operator-base/playbooks/collect-logs.yaml
vars:
cifmw_extras:
- "@scenarios/centos-9/multinode-ci.yml"
s2i_extras:
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/nova-operator'].src_dir }}/ci/nova-operator-tempest-multinode-ceph/ci_fw_vars.yaml"
# dedupe this later
cifmw_run_test_role: test_operator
Expand All @@ -195,7 +197,6 @@
cifmw_test_operator_tempest_namespace: openstack-s2i-containers
cifmw_test_operator_tempest_image_tag: master-latest
cifmw_test_operator_tempest_container: openstack-tempest
s2i_cinder_volume_backends: ['volume1']
# NOTE(gibi): identity.v3_endpoint_type override is a WA to force the
# publicURL as otherwise tempest gets configured with adminURL and that
# causes test instability.
Expand Down Expand Up @@ -269,11 +270,6 @@
- placement/placement-api
- cyborg/cyborg
- cyborg/cyborg-agent
# NOTE(amartyasinha): s2i_cinder_volume_backends overrides
# cinder-volume to the local content-provider image, so build it
# here. Alt: check how the image override resolves and set a quay
# ref to avoid building cinder-volume in nova-operator.
- cinder/cinder-volume

- project:
name: openstack-k8s-operators/nova-operator
Expand All @@ -291,7 +287,7 @@
- nova-operator-kuttl-placement
- nova-operator-tempest-multinode
- nova-operator-tempest-multinode-ceph:
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-22-1-3xl
nodeset: centos-10-medium-centos-10-crc-cloud-ocp-4-22-1-3xl
- nova-operator-cyborg-tempest-multinode:
voting: false
files:
Expand Down
Loading