From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 5 Mar 2024 19:42:24 +0000 (-0500)
Subject: qa/upgrade/quincy: bump ubuntu from 20->22
X-Git-Tag: v20.0.0~2245^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7d68aaff3b81b8f3aaab7d98fbc8fbbcc28d8755;p=ceph.git

qa/upgrade/quincy: bump ubuntu from 20->22

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
deleted file mode 100644
index dd33de8067e15..0000000000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"
-
-tasks:
-- cephadm:
-    image: quay.io/ceph/ceph:v17.2.0
-    cephadm_branch: v17.2.0
-    cephadm_git_url: https://github.com/ceph/ceph
-
-roles:
-- - mon.a
-  - mon.c
-  - mgr.y
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-  - node-exporter.a
-  - alertmanager.a
-- - mon.b
-  - mgr.x
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.1
-  - prometheus.a
-  - grafana.a
-  - node-exporter.b
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
new file mode 100644
index 0000000000000..767cd2421941b
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
@@ -0,0 +1,30 @@
+os_type: ubuntu
+os_version: "22.04"
+
+tasks:
+- cephadm:
+    image: quay.io/ceph/ceph:v17.2.0
+    cephadm_branch: v17.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
deleted file mode 120000
index 162964882d383..0000000000000
--- a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml
new file mode 120000
index 0000000000000..3a09f9abb05ca
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml
deleted file mode 100644
index e1374c4105d86..0000000000000
--- a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"
-# the normal ubuntu 20.04 kernel (5.4.0-88-generic currently) have a bug that prevents the nvme_loop
-# from behaving.  I think it is this:
-#   https://lkml.org/lkml/2020/9/21/1456
-# (at least, that is the symptom: nvme nvme1: Connect command failed, error wo/DNR bit: 880)
-overrides:
-  kernel:
-    hwe: true
\ No newline at end of file
diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml
new file mode 120000
index 0000000000000..3a09f9abb05ca
--- /dev/null
+++ b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file