qa/cephadm: Add mgr/cephadm/use_repo_digest true to upgrade test

As this is the most interesting test suite

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d390f4623530300cf4d8b12569eb6a98797d074b)

diff --git a/qa/suites/rados/cephadm/upgrade/2-repo_digest/defaut.yaml b/qa/suites/rados/cephadm/upgrade/2-repo_digest/defaut.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml b/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml
new file mode 100644 (file)
index 0000000..87e9e44
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force

diff --git a/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml
deleted file mode 100644 (file)
index f13b2e0..0000000
--- a/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- cephadm.shell:
-    env: [sha1]
-    mon.a:
-      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1

diff --git a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
new file mode 100644 (file)
index 0000000..f13b2e0
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1

diff --git a/qa/suites/rados/cephadm/upgrade/3-wait.yaml b/qa/suites/rados/cephadm/upgrade/3-wait.yaml
deleted file mode 100644 (file)
index e14aabf..0000000
--- a/qa/suites/rados/cephadm/upgrade/3-wait.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- cephadm.shell:
-    env: [sha1]
-    mon.a:
-      - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done
-      - ceph orch ps
-      - ceph versions
-      - ceph versions | jq -e '.overall | length == 1'
-      - ceph versions | jq -e '.overall | keys' | grep $sha1

diff --git a/qa/suites/rados/cephadm/upgrade/4-wait.yaml b/qa/suites/rados/cephadm/upgrade/4-wait.yaml
new file mode 100644 (file)
index 0000000..e14aabf
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/4-wait.yaml
@@ -0,0 +1,9 @@
+tasks:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done
+      - ceph orch ps
+      - ceph versions
+      - ceph versions | jq -e '.overall | length == 1'
+      - ceph versions | jq -e '.overall | keys' | grep $sha1