diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 637ba11..ebb3ae1 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -57,6 +57,7 @@ master_flavor_id: ds2G copy_logs: true +# TODO(tkajinam): Remove this once stable/2025.1 is retired. - job: name: magnum-tempest-plugin-tests-cluster-base parent: magnum-tempest-plugin-base @@ -81,16 +82,6 @@ zuul_copy_output: /tmp/magnum-nodes: logs -- nodeset: - name: magnum-nested-virt-ubuntu-jammy - nodes: - - name: controller - label: nested-virt-ubuntu-jammy - groups: - - name: tempest - nodes: - - controller - - nodeset: name: magnum-nested-virt-ubuntu-noble nodes: diff --git a/.zuul.d/jobs_2025_1.yaml b/.zuul.d/jobs_2025_1.yaml index 4793340..dedb154 100644 --- a/.zuul.d/jobs_2025_1.yaml +++ b/.zuul.d/jobs_2025_1.yaml @@ -1,4 +1,44 @@ --- +- job: + name: magnum-tempest-plugin-tests-cluster + parent: magnum-tempest-plugin-tests-cluster-base + nodeset: magnum-nested-virt-ubuntu-noble + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://github.com/vexxhost/capo-image-elements/releases/download/2026.05-1/ubuntu-24.04-v1.35.4.qcow2 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: ubuntu-24.04-v1.35.4 + +- job: + name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 + parent: magnum-tempest-plugin-tests-cluster + +- job: + name: magnum-tempest-plugin-tests-api + parent: magnum-tempest-plugin-tests-api-base + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://github.com/vexxhost/capo-image-elements/releases/download/2026.05-1/ubuntu-24.04-v1.35.4.qcow2 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: ubuntu-24.04-v1.35.4 + devstack_plugins: + magnum-cluster-api: https://github.com/vexxhost/magnum-cluster-api + +# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least +# one job on jammy. This job can be removed as per the future testing +# runtime (whenever we start testing Ubuntu 26.04 as default version). +- job: + name: magnum-tempest-plugin-tests-api-jammy + description: This job testing on Ubuntu jammy(22.04) + parent: magnum-tempest-plugin-tests-api + nodeset: openstack-single-node-noble + - job: name: magnum-tempest-plugin-tests-api-2025-1 parent: magnum-tempest-plugin-tests-api-base diff --git a/.zuul.d/jobs_2025_2.yaml b/.zuul.d/jobs_2025_2.yaml index 4ae3eac..bc62141 100644 --- a/.zuul.d/jobs_2025_2.yaml +++ b/.zuul.d/jobs_2025_2.yaml @@ -13,40 +13,6 @@ magnum: image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 -- job: - name: magnum-tempest-plugin-tests-cluster-2025-2 - parent: magnum-tempest-plugin-tests-cluster-base - nodeset: magnum-nested-virt-ubuntu-noble - override-checkout: stable/2025.2 - vars: - devstack_localrc: - MAGNUM_GUEST_IMAGE_URL: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/38.20230806.3.0/x86_64/fedora-coreos-38.20230806.3.0-openstack.x86_64.qcow2.xz - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - image_id: fedora-coreos-38.20230806.3.0-openstack.x86_64 - -- job: - name: magnum-tempest-plugin-tests-cluster-2025-2-k8s_fcos_v1-v1.27.8 - parent: magnum-tempest-plugin-tests-cluster-2025-2 - vars: - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - labels: - kube_tag: v1.27.8-rancher2 - container_runtime: containerd - containerd_version: 1.6.28 - containerd_tarball_sha256: f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b - cloud_provider_tag: v1.27.3 - cinder_csi_plugin_tag: v1.27.3 - k8s_keystone_auth_tag: v1.27.3 - magnum_auto_healer_tag: v1.27.3 - octavia_ingress_controller_tag: v1.27.3 - calico_tag: v3.26.4 - - project-template: name: magnum-tempest-plugin-jobs-2025-2 check: diff --git a/.zuul.d/jobs_2026_2.yaml b/.zuul.d/jobs_2026_2.yaml new file mode 100644 index 0000000..72b7330 --- /dev/null +++ b/.zuul.d/jobs_2026_2.yaml @@ -0,0 +1,24 @@ +--- +- job: + name: magnum-tempest-plugin-tests-api-2026-2 + parent: magnum-tempest-plugin-tests-api-base + override-checkout: stable/2026.2 + vars: + devstack_localrc: + MAGNUM_GUEST_IMAGE_URL: https://github.com/vexxhost/capo-image-elements/releases/download/2026.05-1/ubuntu-24.04-v1.35.4.qcow2 + devstack_local_conf: + test-config: + $TEMPEST_CONFIG: + magnum: + image_id: ubuntu-24.04-v1.35.4 + devstack_plugins: + magnum-cluster-api: https://github.com/vexxhost/magnum-cluster-api + +- project-template: + name: magnum-tempest-plugin-jobs-2026-2 + check: + jobs: + - magnum-tempest-plugin-tests-api-2026-2 + gate: + jobs: + - magnum-tempest-plugin-tests-api-2026-2 diff --git a/.zuul.d/jobs_master.yaml b/.zuul.d/jobs_master.yaml index 54c326a..495eefe 100644 --- a/.zuul.d/jobs_master.yaml +++ b/.zuul.d/jobs_master.yaml @@ -1,86 +1,4 @@ --- -- job: - name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.27 - parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 - vars: - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - labels: - kube_tag: v1.27.8-rancher2 - container_runtime: containerd - containerd_version: 1.6.28 - containerd_tarball_sha256: f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b - cloud_provider_tag: v1.27.3 - cinder_csi_plugin_tag: v1.27.3 - k8s_keystone_auth_tag: v1.27.3 - magnum_auto_healer_tag: v1.27.3 - octavia_ingress_controller_tag: v1.27.3 - calico_tag: v3.26.4 - - -- job: - name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-v1.28 - parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 - vars: - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - labels: - kube_tag: v1.28.9-rancher1 - container_runtime: containerd - containerd_version: 1.6.31 - containerd_tarball_sha256: 75afb9b9674ff509ae670ef3ab944ffcdece8ea9f7d92c42307693efa7b6109d - cloud_provider_tag: v1.27.3 - cinder_csi_plugin_tag: v1.27.3 - k8s_keystone_auth_tag: v1.27.3 - magnum_auto_healer_tag: v1.27.3 - octavia_ingress_controller_tag: v1.27.3 - calico_tag: v3.26.4 - -- job: - name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1 - parent: magnum-tempest-plugin-tests-cluster - -- job: - name: magnum-tempest-plugin-tests-api - parent: magnum-tempest-plugin-tests-api-base - vars: - devstack_localrc: - MAGNUM_GUEST_IMAGE_URL: https://github.com/vexxhost/capo-image-elements/releases/download/2026.05-1/ubuntu-24.04-v1.35.4.qcow2 - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - image_id: ubuntu-24.04-v1.35.4 - devstack_plugins: - magnum-cluster-api: https://github.com/vexxhost/magnum-cluster-api - -# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least -# one job on jammy. This job can be removed as per the future testing -# runtime (whenever we start testing Ubuntu 26.04 as default version). -- job: - name: magnum-tempest-plugin-tests-api-jammy - description: This job testing on Ubuntu jammy(22.04) - parent: magnum-tempest-plugin-tests-api - nodeset: openstack-single-node-noble - - -- job: - name: magnum-tempest-plugin-tests-cluster - parent: magnum-tempest-plugin-tests-cluster-base - nodeset: magnum-nested-virt-ubuntu-noble - vars: - devstack_localrc: - MAGNUM_GUEST_IMAGE_URL: https://github.com/vexxhost/capo-image-elements/releases/download/2026.05-1/ubuntu-24.04-v1.35.4.qcow2 - devstack_local_conf: - test-config: - $TEMPEST_CONFIG: - magnum: - image_id: ubuntu-24.04-v1.35.4 - - project-template: name: magnum-tempest-plugin-jobs-master check: