qa/cephadm: start mgr-nfs-upgrade sequences from squid and tentacle

As main is what will become umbrella we no longer
need the reef tests. I also added tests for the current
state of the branch since we were only testing against
the initial release

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/18.2.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/18.2.0.yaml
deleted file mode 100644 (file)
index 497c2d3..0000000
--- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/18.2.0.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-only-match:
-      - CEPHADM_
-tasks:
-- cephadm:
-    roleless: true
-    image: quay.io/ceph/ceph:v18.2.0
-    cephadm_branch: v18.2.0
-    cephadm_git_url: https://github.com/ceph/ceph

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/19.2.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/19.2.0.yaml
new file mode 100644 (file)
index 0000000..85a9df6
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/19.2.0.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-only-match:
+      - CEPHADM_
+tasks:
+- cephadm:
+    roleless: true
+    image: quay.io/ceph/ceph:v19.2.0
+    cephadm_branch: v19.2.0
+    cephadm_git_url: https://github.com/ceph/ceph

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/20.2.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/20.2.0.yaml
new file mode 100644 (file)
index 0000000..2feb885
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/20.2.0.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-only-match:
+      - CEPHADM_
+tasks:
+- cephadm:
+    roleless: true
+    image: quay.io/ceph/ceph:v20.2.0
+    cephadm_branch: v20.2.0
+    cephadm_git_url: https://github.com/ceph/ceph

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/squid.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/squid.yaml
new file mode 100644 (file)
index 0000000..5a3ff34
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/squid.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-only-match:
+      - CEPHADM_
+tasks:
+- cephadm:
+    roleless: true
+    image: quay.ceph.io/ceph-ci/ceph:squid
+    compiled_cephadm_branch: squid
+

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/tentacle.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/tentacle.yaml
new file mode 100644 (file)
index 0000000..89dce95
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/tentacle.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-only-match:
+      - CEPHADM_
+tasks:
+- cephadm:
+    roleless: true
+    image: quay.ceph.io/ceph-ci/ceph:tentacle
+    compiled_cephadm_branch: tentacle
+