Skip to content

Commit cfb26d8

Browse files
committed
qa/cephadm: change upgrade test start point to reef/squid
Since main is now what will become the T release, we only need to be testing upgrades from reef and squid. Upgrades from quincy won't be valid once we've branched off Signed-off-by: Adam King <[email protected]>
1 parent 31603f3 commit cfb26d8

File tree

4 files changed

+62
-6
lines changed

4 files changed

+62
-6
lines changed

qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml renamed to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream-reef.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ os_version: "9.stream"
33

44
tasks:
55
- cephadm:
6-
image: quay.io/ceph/ceph:v17.2.0
7-
cephadm_branch: v17.2.0
8-
cephadm_git_url: https://github.com/ceph/ceph
6+
image: quay.ceph.io/ceph-ci/ceph:reef
7+
compiled_cephadm_branch: reef
98

109
roles:
1110
- - mon.a
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
os_type: centos
2+
os_version: "9.stream"
3+
4+
tasks:
5+
- cephadm:
6+
image: quay.ceph.io/ceph-ci/ceph:squid
7+
compiled_cephadm_branch: squid
8+
9+
roles:
10+
- - mon.a
11+
- mon.c
12+
- mgr.y
13+
- osd.0
14+
- osd.1
15+
- osd.2
16+
- osd.3
17+
- client.0
18+
- node-exporter.a
19+
- alertmanager.a
20+
- - mon.b
21+
- mgr.x
22+
- osd.4
23+
- osd.5
24+
- osd.6
25+
- osd.7
26+
- client.1
27+
- prometheus.a
28+
- grafana.a
29+
- node-exporter.b

qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml renamed to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04-reef.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ os_version: "22.04"
33

44
tasks:
55
- cephadm:
6-
image: quay.io/ceph/ceph:v17.2.0
7-
cephadm_branch: v17.2.0
8-
cephadm_git_url: https://github.com/ceph/ceph
6+
image: quay.ceph.io/ceph-ci/ceph:reef
7+
compiled_cephadm_branch: reef
98

109
roles:
1110
- - mon.a
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
os_type: ubuntu
2+
os_version: "22.04"
3+
4+
tasks:
5+
- cephadm:
6+
image: quay.ceph.io/ceph-ci/ceph:squid
7+
compiled_cephadm_branch: squid
8+
9+
roles:
10+
- - mon.a
11+
- mon.c
12+
- mgr.y
13+
- osd.0
14+
- osd.1
15+
- osd.2
16+
- osd.3
17+
- client.0
18+
- node-exporter.a
19+
- alertmanager.a
20+
- - mon.b
21+
- mgr.x
22+
- osd.4
23+
- osd.5
24+
- osd.6
25+
- osd.7
26+
- client.1
27+
- prometheus.a
28+
- grafana.a
29+
- node-exporter.b

0 commit comments

Comments
 (0)