qa Upgrade to Umbrella

All the qa tasks in the umbrella release checklist

Signed-off-by: Chris Harris <harriscr@uk.ibm.com>
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>
# Conflicts:
#	qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml
#	qa/workunits/test_telemetry_tentacle.sh
#	qa/workunits/test_telemetry_tentacle_x.sh

diff --git a/qa/workunits/test_telemetry_tentacle.sh b/qa/workunits/test_telemetry_tentacle.sh
index dc562437b955a35b8799a05c0bc8599c71defef0..ac128a8095c40882c7b7b81bed1fe1f45e87c960 100755 (executable)
--- a/qa/workunits/test_telemetry_tentacle.sh
+++ b/qa/workunits/test_telemetry_tentacle.sh
@@ -57,4 +57,7 @@ ceph telemetry show
 ceph telemetry show-device
 ceph telemetry show-all
 
+# Opt out
+ceph telemetry off
+
 echo OK

diff --git a/qa/workunits/test_telemetry_tentacle_x.sh b/qa/workunits/test_telemetry_tentacle_x.sh
index fc96c94493752d16d7d427fefe22712e915bd4bf..5c51654bf253169720694f657a94ed45331b96a9 100755 (executable)
--- a/qa/workunits/test_telemetry_tentacle_x.sh
+++ b/qa/workunits/test_telemetry_tentacle_x.sh
@@ -1,8 +1,19 @@
 #!/bin/bash -ex
 
+# Set up ident details for cluster
+ceph config set mgr mgr/telemetry/channel_ident true
+ceph config set mgr mgr/telemetry/organization 'ceph-qa'
+ceph config set mgr mgr/telemetry/description 'upgrade test cluster'
+
+#Run preview commands
+ceph telemetry preview
+ceph telemetry preview-device
+ceph telemetry preview-all
+
 # Opt in to new collections right away to avoid "TELEMETRY_CHANGED"
 # warning (see https://tracker.ceph.com/issues/64458)
 ceph telemetry on --license sharing-1-0
+ceph telemetry enable channel perf
 
 # The last_opt_revision remains at 1 since last_opt_revision
 # was phased out for fresh installs of quincy.