From: Adam King Date: Wed, 28 Sep 2022 16:34:35 +0000 (-0400) Subject: qa/cephadm: do not start upgrades from Octopus X-Git-Tag: v18.1.0~1061^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80025d06d1748542e6fec34531030b148f93b01d;p=ceph.git qa/cephadm: do not start upgrades from Octopus now that we officially have v18 in main the upgrade will fail if upgrading from Octopus (v15) to main because they are now considered 3 major releases apart Additionally adding more debugging to the end of the upgrade tests as something like `ceph health detail` can be very useful to see at the end of failed upgrade tests Fixes: https://tracker.ceph.com/issues/57695 Signed-off-by: Adam King --- diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml index 2dc4eab61240..392b1e66d7ed 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml @@ -15,8 +15,10 @@ upgrade-tasks: - cephadm.shell: env: [sha1] host.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; sleep 30 ; done + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done - ceph orch ps + - ceph orch upgrade status + - ceph health detail - ceph versions - echo "wait for servicemap items w/ changing names to refresh" - sleep 60 diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.0.yaml new file mode 100644 index 000000000000..beba374286dd --- /dev/null +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.0.yaml @@ -0,0 +1,8 @@ +tasks: +- cephadm: + roleless: true + image: quay.io/ceph/ceph:v16.2.0 + cephadm_branch: v16.2.0 + cephadm_git_url: https://github.com/ceph/ceph + # needed for v16.2.0 due to --skip-admin-label + avoid_pacific_features: true diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml deleted file mode 100644 index 927c1d5bfeb0..000000000000 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- cephadm: - roleless: true - image: quay.io/ceph/ceph:v15 - cephadm_branch: octopus - cephadm_git_url: https://github.com/ceph/ceph - avoid_pacific_features: true - add_mons_via_daemon_add: true diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml index 362e0373416e..ec901a92eee4 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml @@ -16,12 +16,14 @@ upgrade-tasks: - cephadm.shell: env: [sha1] host.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done - ceph orch ps - ceph versions - echo "wait for servicemap items w/ changing names to refresh" - sleep 60 - ceph orch ps + - ceph orch upgrade status + - ceph health detail - ceph versions - ceph versions | jq -e '.overall | length == 1' - ceph versions | jq -e '.overall | keys' | grep $sha1 diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml index 0cbd7906424e..b792c2857065 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml @@ -9,8 +9,8 @@ tasks: - sudo dnf -y module install container-tools - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf - cephadm: - image: quay.io/ceph/ceph:v15.2.0 - cephadm_branch: v15.2.0 + image: quay.io/ceph/ceph:v16.2.0 + cephadm_branch: v16.2.0 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions allow_ptrace: false @@ -27,7 +27,6 @@ roles: - osd.2 - osd.3 - client.0 -# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start - node-exporter.a - alertmanager.a - - mon.b @@ -40,4 +39,4 @@ roles: - prometheus.a - grafana.a - node-exporter.b -# - ceph.iscsi.iscsi.a # needs later start point + - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml deleted file mode 100644 index 0fec8a3aa0aa..000000000000 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml +++ /dev/null @@ -1,37 +0,0 @@ -os_type: ubuntu -os_version: "20.04" - -tasks: -- cephadm: - image: quay.io/ceph/ceph:v15.2.9 - cephadm_branch: v15.2.9 - cephadm_git_url: https://github.com/ceph/ceph - # avoid --cap-add=PTRACE + --privileged for older cephadm versions - allow_ptrace: false - # deploy additional mons the "old" (octopus) way - add_mons_via_daemon_add: true - avoid_pacific_features: true - -roles: -- - mon.a - - mon.c - - mgr.y - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 -# - ceph.rgw.realm.zone.a # CLI change in v16 pacific - - 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 - - ceph.iscsi.iscsi.a 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 index ba81c537cd97..0ac9de158280 100644 --- 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 @@ -3,8 +3,8 @@ os_version: "20.04" tasks: - cephadm: - image: quay.io/ceph/ceph:v15.2.0 - cephadm_branch: v15.2.0 + image: quay.io/ceph/ceph:v16.2.0 + cephadm_branch: v16.2.0 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions allow_ptrace: false @@ -21,7 +21,6 @@ roles: - osd.2 - osd.3 - client.0 -# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start - node-exporter.a - alertmanager.a - - mon.b @@ -34,4 +33,4 @@ roles: - prometheus.a - grafana.a - node-exporter.b -# - ceph.iscsi.iscsi.a # needs later start point + - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/4-wait.yaml b/qa/suites/orch/cephadm/upgrade/4-wait.yaml index 58afe00c5be8..4010c58ed779 100644 --- a/qa/suites/orch/cephadm/upgrade/4-wait.yaml +++ b/qa/suites/orch/cephadm/upgrade/4-wait.yaml @@ -2,13 +2,15 @@ tasks: - cephadm.shell: env: [sha1] mon.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; ceph health detail ; sleep 30 ; done - ceph orch ps - ceph versions - echo "wait for servicemap items w/ changing names to refresh" - sleep 60 - ceph orch ps - ceph versions + - ceph orch upgrade status + - ceph health detail - ceph versions | jq -e '.overall | length == 1' - ceph versions | jq -e '.overall | keys' | grep $sha1 - ceph orch ls | grep '^osd '