From 409e6d06e5ab64cc51095bf806963917c9924199 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Feb 2020 21:26:35 +0000
Subject: [PATCH] qa/suites/rados/cephadm/upgrade: add simple upgrade test

Signed-off-by: Sage Weil <sage@redhat.com>
---
 qa/suites/rados/cephadm/upgrade/%                    | 0
 qa/suites/rados/cephadm/upgrade/.qa                  | 1 +
 qa/suites/rados/cephadm/upgrade/1-start.yaml         | 4 ++++
 qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml | 5 +++++
 qa/suites/rados/cephadm/upgrade/3-wait.yaml          | 9 +++++++++
 qa/suites/rados/cephadm/upgrade/distro$              | 1 +
 qa/suites/rados/cephadm/upgrade/fixed-2.yaml         | 1 +
 7 files changed, 21 insertions(+)
 create mode 100644 qa/suites/rados/cephadm/upgrade/%
 create mode 120000 qa/suites/rados/cephadm/upgrade/.qa
 create mode 100644 qa/suites/rados/cephadm/upgrade/1-start.yaml
 create mode 100644 qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml
 create mode 100644 qa/suites/rados/cephadm/upgrade/3-wait.yaml
 create mode 120000 qa/suites/rados/cephadm/upgrade/distro$
 create mode 120000 qa/suites/rados/cephadm/upgrade/fixed-2.yaml

diff --git a/qa/suites/rados/cephadm/upgrade/% b/qa/suites/rados/cephadm/upgrade/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rados/cephadm/upgrade/.qa b/qa/suites/rados/cephadm/upgrade/.qa
new file mode 120000
index 00000000000..fea2489fdf6
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rados/cephadm/upgrade/1-start.yaml b/qa/suites/rados/cephadm/upgrade/1-start.yaml
new file mode 100644
index 00000000000..dfeb64d5b4e
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephadm:
+    image: quay.io/ceph-ci/ceph:wip-sage-testing-2020-02-14-0900
+    cephadm_branch: wip-sage-testing-2020-02-14-0900
diff --git a/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml
new file mode 100644
index 00000000000..a65d6001e78
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - ceph upgrade start --image quay.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
new file mode 100644
index 00000000000..4d3e4f1eb1f
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/3-wait.yaml
@@ -0,0 +1,9 @@
+tasks:
+- cephadm.shell:
+    env: [sha1]
+    mon.a:
+      - while ceph 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/distro$ b/qa/suites/rados/cephadm/upgrade/distro$
new file mode 120000
index 00000000000..d2dffb18188
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/distro$
@@ -0,0 +1 @@
+../smoke/distro
\ No newline at end of file
diff --git a/qa/suites/rados/cephadm/upgrade/fixed-2.yaml b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
new file mode 120000
index 00000000000..5c3e0593cbc
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
@@ -0,0 +1 @@
+../smoke/fixed-2.yaml
\ No newline at end of file
-- 
2.39.5