diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5d3fef3..c5ac450 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,32 +1,115 @@ --- +## Templates + +# Rocky 9 multinode template + - job: - name: cephadm-jammy-singlenode-docker-reef + name: .cephadm-rocky9-multinode-template + abstract: true + parent: cephadm-base + nodeset: cephadm-rocky9-multinode + +# Ubuntu Jammy signle node template + +- job: + name: .cephadm-jammy-single-template + abstract: true parent: cephadm-base nodeset: cephadm-jammy-single + +# Ubuntu Jammy multinode template + +- job: + name: .cephadm-jammy-multinode-template + abstract: true + parent: cephadm-base + nodeset: cephadm-jammy-multinode + +# Ubuntu Noble multinode template + +- job: + name: .cephadm-noble-multinode-template + abstract: true + parent: cephadm-base + nodeset: cephadm-noble-multinode + +## Job definitions +## Note: Bootstrapping Reef on Noble is currently not supported, similar to Squid on Jammy. + +# Ubuntu Jammy single node + +- job: + name: cephadm-jammy-singlenode-docker-reef + parent: .cephadm-jammy-single-template vars: cephadm_ceph_release: reef cephadm_container_engine: docker - job: name: cephadm-jammy-singlenode-podman-reef - parent: cephadm-base - nodeset: cephadm-jammy-single + parent: .cephadm-jammy-single-template vars: cephadm_ceph_release: reef cephadm_container_engine: podman +# Ubuntu Jammy + - job: name: cephadm-jammy-multinode-docker-reef - parent: cephadm-base - nodeset: cephadm-jammy-multinode + parent: .cephadm-jammy-multinode-template vars: cephadm_ceph_release: reef cephadm_container_engine: docker - job: name: cephadm-jammy-multinode-podman-reef - parent: cephadm-base - nodeset: cephadm-jammy-multinode + parent: .cephadm-jammy-multinode-template vars: cephadm_ceph_release: reef cephadm_container_engine: podman + +# Ubuntu Noble + +- job: + name: cephadm-noble-multinode-docker-squid + parent: .cephadm-noble-multinode-template + vars: + cephadm_ceph_release: squid + cephadm_container_engine: docker + +- job: + name: cephadm-noble-multinode-podman-squid + parent: .cephadm-noble-multinode-template + vars: + cephadm_ceph_release: squid + cephadm_container_engine: podman + +# Rocky 9 + +- job: + name: cephadm-rocky9-multinode-docker-reef + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: reef + cephadm_container_engine: docker + +- job: + name: cephadm-rocky9-multinode-podman-reef + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: reef + cephadm_container_engine: podman + +- job: + name: cephadm-rocky9-multinode-docker-squid + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: squid + cephadm_container_engine: docker + +- job: + name: cephadm-rocky9-multinode-podman-squid + parent: .cephadm-rocky9-multinode-template + vars: + cephadm_ceph_release: squid + cephadm_container_engine: podman diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 8ca95ce..bbe20d0 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -27,7 +27,7 @@ label: ubuntu-jammy - name: ceph-3 label: ubuntu-jammy - groups: + groups: &multinode_groups - name: ceph nodes: &multinode_nodes - ceph-1 @@ -39,3 +39,25 @@ nodes: *multinode_nodes - name: osds nodes: *multinode_nodes + +- nodeset: + name: cephadm-noble-multinode + nodes: + - name: ceph-1 + label: ubuntu-noble + - name: ceph-2 + label: ubuntu-noble + - name: ceph-3 + label: ubuntu-noble + groups: *multinode_groups + +- nodeset: + name: cephadm-rocky9-multinode + nodes: + - name: ceph-1 + label: rocky-9 + - name: ceph-2 + label: rocky-9 + - name: ceph-3 + label: rocky-9 + groups: *multinode_groups diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 02fcad4..f26df67 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -1,11 +1,17 @@ --- +# Note: Bootstrapping Reef on Noble is currently not supported, similar to Squid on Jammy. + - project: check: jobs: - cephadm-jammy-multinode-docker-reef - cephadm-jammy-multinode-podman-reef + - cephadm-noble-multinode-docker-squid + - cephadm-noble-multinode-podman-squid - tox-linters gate: jobs: - cephadm-jammy-multinode-docker-reef - cephadm-jammy-multinode-podman-reef + - cephadm-noble-multinode-docker-squid + - cephadm-noble-multinode-podman-squid