Skip to content

Commit 6575482

Browse files
committed
CI: Add Noble and Squid testing + Rocky job definitions
1 parent 04c275c commit 6575482

File tree

3 files changed

+119
-8
lines changed

3 files changed

+119
-8
lines changed

zuul.d/jobs.yaml

Lines changed: 90 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,115 @@
11
---
2+
## Templates
3+
4+
# Rocky 9 multinode template
5+
26
- job:
3-
name: cephadm-jammy-singlenode-docker-reef
7+
name: .cephadm-rocky9-multinode-template
8+
abstract: true
9+
parent: cephadm-base
10+
nodeset: cephadm-rocky9-multinode
11+
12+
# Ubuntu Jammy signle node template
13+
14+
- job:
15+
name: .cephadm-jammy-single-template
16+
abstract: true
417
parent: cephadm-base
518
nodeset: cephadm-jammy-single
19+
20+
# Ubuntu Jammy multinode template
21+
22+
- job:
23+
name: .cephadm-jammy-multinode-template
24+
abstract: true
25+
parent: cephadm-base
26+
nodeset: cephadm-jammy-multinode
27+
28+
# Ubuntu Noble multinode template
29+
30+
- job:
31+
name: .cephadm-noble-multinode-template
32+
abstract: true
33+
parent: cephadm-base
34+
nodeset: cephadm-noble-multinode
35+
36+
## Job definitions
37+
## Note: Bootstrapping Reef on Noble is currently not supported, similar to Squid on Jammy.
38+
39+
# Ubuntu Jammy single node
40+
41+
- job:
42+
name: cephadm-jammy-singlenode-docker-reef
43+
parent: .cephadm-jammy-single-template
644
vars:
745
cephadm_ceph_release: reef
846
cephadm_container_engine: docker
947

1048
- job:
1149
name: cephadm-jammy-singlenode-podman-reef
12-
parent: cephadm-base
13-
nodeset: cephadm-jammy-single
50+
parent: .cephadm-jammy-single-template
1451
vars:
1552
cephadm_ceph_release: reef
1653
cephadm_container_engine: podman
1754

55+
# Ubuntu Jammy
56+
1857
- job:
1958
name: cephadm-jammy-multinode-docker-reef
20-
parent: cephadm-base
21-
nodeset: cephadm-jammy-multinode
59+
parent: .cephadm-jammy-multinode-template
2260
vars:
2361
cephadm_ceph_release: reef
2462
cephadm_container_engine: docker
2563

2664
- job:
2765
name: cephadm-jammy-multinode-podman-reef
28-
parent: cephadm-base
29-
nodeset: cephadm-jammy-multinode
66+
parent: .cephadm-jammy-multinode-template
3067
vars:
3168
cephadm_ceph_release: reef
3269
cephadm_container_engine: podman
70+
71+
# Ubuntu Noble
72+
73+
- job:
74+
name: cephadm-noble-multinode-docker-squid
75+
parent: .cephadm-noble-multinode-template
76+
vars:
77+
cephadm_ceph_release: squid
78+
cephadm_container_engine: docker
79+
80+
- job:
81+
name: cephadm-noble-multinode-podman-squid
82+
parent: .cephadm-noble-multinode-template
83+
vars:
84+
cephadm_ceph_release: squid
85+
cephadm_container_engine: podman
86+
87+
# Rocky 9
88+
89+
- job:
90+
name: cephadm-rocky9-multinode-docker-reef
91+
parent: .cephadm-rocky9-multinode-template
92+
vars:
93+
cephadm_ceph_release: reef
94+
cephadm_container_engine: docker
95+
96+
- job:
97+
name: cephadm-rocky9-multinode-podman-reef
98+
parent: .cephadm-rocky9-multinode-template
99+
vars:
100+
cephadm_ceph_release: reef
101+
cephadm_container_engine: podman
102+
103+
- job:
104+
name: cephadm-rocky9-multinode-docker-squid
105+
parent: .cephadm-rocky9-multinode-template
106+
vars:
107+
cephadm_ceph_release: squid
108+
cephadm_container_engine: docker
109+
110+
- job:
111+
name: cephadm-rocky9-multinode-podman-squid
112+
parent: .cephadm-rocky9-multinode-template
113+
vars:
114+
cephadm_ceph_release: squid
115+
cephadm_container_engine: podman

zuul.d/nodesets.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
label: ubuntu-jammy
2828
- name: ceph-3
2929
label: ubuntu-jammy
30-
groups:
30+
groups: &multinode_groups
3131
- name: ceph
3232
nodes: &multinode_nodes
3333
- ceph-1
@@ -39,3 +39,25 @@
3939
nodes: *multinode_nodes
4040
- name: osds
4141
nodes: *multinode_nodes
42+
43+
- nodeset:
44+
name: cephadm-noble-multinode
45+
nodes:
46+
- name: ceph-1
47+
label: ubuntu-noble
48+
- name: ceph-2
49+
label: ubuntu-noble
50+
- name: ceph-3
51+
label: ubuntu-noble
52+
groups: *multinode_groups
53+
54+
- nodeset:
55+
name: cephadm-rocky9-multinode
56+
nodes:
57+
- name: ceph-1
58+
label: rocky-9
59+
- name: ceph-2
60+
label: rocky-9
61+
- name: ceph-3
62+
label: rocky-9
63+
groups: *multinode_groups

zuul.d/project.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
---
2+
# Note: Bootstrapping Reef on Noble is currently not supported, similar to Squid on Jammy.
3+
24
- project:
35
check:
46
jobs:
57
- cephadm-jammy-multinode-docker-reef
68
- cephadm-jammy-multinode-podman-reef
9+
- cephadm-noble-multinode-docker-squid
10+
- cephadm-noble-multinode-podman-squid
711
- tox-linters
812
gate:
913
jobs:
1014
- cephadm-jammy-multinode-docker-reef
1115
- cephadm-jammy-multinode-podman-reef
16+
- cephadm-noble-multinode-docker-squid
17+
- cephadm-noble-multinode-podman-squid

0 commit comments

Comments
 (0)