qa: mds upgrade suite as per merge-hook scripts

Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml
new file mode 100644 (file)
index 0000000..868415b
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml
@@ -0,0 +1,3 @@
+teuthology:
+  variables:
+    fail_fs: false

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml
new file mode 100644 (file)
index 0000000..411ff38
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml
@@ -0,0 +1,3 @@
+teuthology:
+  variables:
+    fail_fs: true

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml
index 67c27ba6bac3e7bd63d6b8ff18b335db76f23687..6432d708055e29674e689259d2fd0a295a124c77 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml
@@ -9,7 +9,7 @@ tasks:
       - ceph-volume
 - print: "**** done install task..."
 - cephadm:
-    image: quay.io/ceph/daemon-base:latest-pacific
+    image: quay.ceph.io/ceph-ci/ceph:pacific
     roleless: true
     cephadm_branch: pacific
     cephadm_git_url: https://github.com/ceph/ceph

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
index c732d692ac13d36819acfdd706f8771f88f5326a..36bfb1b91be6a9e65a22e43a4a3502923c37a6a4 100644 (file)
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
@@ -1,3 +1,7 @@
+teuthology:
+  postmerge:
+    - if yaml.teuthology.variables.fail_fs then reject() end
+
 meta:
 - desc: |
    setup ceph/pacific v16.2.4

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml
new file mode 100644 (file)
index 0000000..fac9e29
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml
@@ -0,0 +1,18 @@
+teuthology:
+  premerge: |
+            if not yaml.teuthology.variables.fail_fs then reject() end
+upgrade-tasks:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        host.a:
+          - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
+          - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
+          - ceph config set global log_to_journald false --force
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mgr
+          - 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
+          - ceph versions | jq -e '.mgr | length == 1'
+          - ceph versions | jq -e '.mgr | keys' | grep $sha1
+          - ceph versions | jq -e '.overall | length == 2'
+          - ceph orch upgrade check quay.ceph.io/ceph-ci/ceph:$sha1 | jq -e '.up_to_date | length == 2'
+          - ceph orch ps

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml
deleted file mode 100644 (file)
index 457b7e3..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-tasks:
-- parallel:
-  - upgrade-tasks
-  - workload-tasks
-
-upgrade-tasks:
-  sequential:
-  - cephadm.shell:
-      env: [sha1]
-      host.a:
-        - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
-        - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
-        - ceph config set global log_to_journald false --force
-        - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
-  - 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
-        - ceph orch ps
-        - ceph versions
-        - echo "wait for servicemap items w/ changing names to refresh"
-        - sleep 60
-        - ceph orch ps
-        - ceph versions
-        - ceph versions | jq -e '.overall | length == 1'
-        - ceph versions | jq -e '.overall | keys' | grep $sha1
-
-workload-tasks:
-  sequential:
-  - workunit:
-      clients:
-        all:
-          - suites/fsstress.sh

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml
new file mode 100644 (file)
index 0000000..9b21958
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml
@@ -0,0 +1,9 @@
+teuthology:
+  premerge: |
+            if not yaml.teuthology.variables.fail_fs then reject() end
+upgrade-tasks:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        host.a:
+          - ceph config set mgr mgr/orchestrator/fail_fs true
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-verify.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-verify.yaml
deleted file mode 100644 (file)
index c2b657e..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-verify.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- cephadm.shell:
-    host.a:
-      - ceph fs dump
-- fs.post_upgrade_checks:

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
new file mode 100644 (file)
index 0000000..2dc4eab
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml
@@ -0,0 +1,33 @@
+tasks:
+- parallel:
+  - upgrade-tasks
+  - workload-tasks
+
+upgrade-tasks:
+  sequential:
+    - cephadm.shell:
+        env: [sha1]
+        host.a:
+          - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force
+          - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force
+          - ceph config set global log_to_journald false --force
+          - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+    - 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
+          - ceph orch ps
+          - ceph versions
+          - echo "wait for servicemap items w/ changing names to refresh"
+          - sleep 60
+          - ceph orch ps
+          - ceph versions
+          - ceph versions | jq -e '.overall | length == 1'
+          - ceph versions | jq -e '.overall | keys' | grep $sha1
+
+workload-tasks:
+  sequential:
+    - workunit:
+        clients:
+          all:
+            - suites/fsstress.sh

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/6-verify.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/6-verify.yaml
new file mode 100644 (file)
index 0000000..c2b657e
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/6-verify.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph fs dump
+- fs.post_upgrade_checks: