From a6e601b7f2ee197946ff310c9e76bd8bbe2cc624 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 18 Dec 2020 11:30:29 -0800 Subject: [PATCH] qa/tests: add light octopus-x/copy (cephadm based) Signed-off-by: Yuri Weinstein --- qa/suites/upgrade/octopus-x/% | 0 qa/suites/upgrade/octopus-x/.qa | 1 + qa/suites/upgrade/octopus-x/1-start.yaml | 28 ++++++++++++++++ .../upgrade/octopus-x/3-start-upgrade.yaml | 9 ++++++ qa/suites/upgrade/octopus-x/4-wait.yaml | 11 +++++++ qa/suites/upgrade/octopus-x/distro$ | 1 + qa/suites/upgrade/octopus-x/fixed-2.yaml | 32 +++++++++++++++++++ qa/suites/upgrade/octopus-x/mon_election | 1 + qa/suites/upgrade/octopus-x/workload/+ | 0 .../upgrade/octopus-x/workload/rados_api.yaml | 12 +++++++ .../octopus-x/workload/test_rbd_api.yaml | 12 +++++++ 11 files changed, 107 insertions(+) create mode 100644 qa/suites/upgrade/octopus-x/% create mode 120000 qa/suites/upgrade/octopus-x/.qa create mode 100644 qa/suites/upgrade/octopus-x/1-start.yaml create mode 100644 qa/suites/upgrade/octopus-x/3-start-upgrade.yaml create mode 100644 qa/suites/upgrade/octopus-x/4-wait.yaml create mode 120000 qa/suites/upgrade/octopus-x/distro$ create mode 100644 qa/suites/upgrade/octopus-x/fixed-2.yaml create mode 120000 qa/suites/upgrade/octopus-x/mon_election create mode 100644 qa/suites/upgrade/octopus-x/workload/+ create mode 100644 qa/suites/upgrade/octopus-x/workload/rados_api.yaml create mode 100644 qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml diff --git a/qa/suites/upgrade/octopus-x/% b/qa/suites/upgrade/octopus-x/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/upgrade/octopus-x/.qa b/qa/suites/upgrade/octopus-x/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/1-start.yaml b/qa/suites/upgrade/octopus-x/1-start.yaml new file mode 100644 index 0000000000000..5e71207316dc9 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/1-start.yaml @@ -0,0 +1,28 @@ +tasks: +- install: + branch: octopus +- print: "**** done install task..." +- print: "**** done start installing octopus cephadm ..." +- cephadm: + #image: docker.io/ceph/ceph:v15.2.0 + #cephadm_branch: v15.2.0 + image: docker.io/ceph/daemon-base:latest-octopus + cephadm_branch: octopus + conf: + osd: + #set config option for which cls modules are allowed to be loaded / used + osd_class_load_list: "*" + osd_class_default_list: "*" +- print: "**** done end installing octopus cephadm ..." + +- print: "**** done start cephadm.shell ceph config set mgr..." +- cephadm.shell: + mon.a: + - ceph config set mgr mgr/cephadm/use_repo_digest true --force +- print: "**** done cephadm.shell ceph config set mgr..." + +- print: "**** done start parallel" +- parallel: + - workload + - upgrade-sequence +- print: "**** done end parallel" diff --git a/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml b/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml new file mode 100644 index 0000000000000..d0b2532e9387a --- /dev/null +++ b/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml @@ -0,0 +1,9 @@ +# renamed tasks: to upgrade-sequence: +upgrade-sequence: + sequential: + - print: "**** done start upgrade" + - cephadm.shell: + env: [sha1] + mon.a: + - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 + - print: "**** done end upgrade" diff --git a/qa/suites/upgrade/octopus-x/4-wait.yaml b/qa/suites/upgrade/octopus-x/4-wait.yaml new file mode 100644 index 0000000000000..8e03083cd1cc0 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/4-wait.yaml @@ -0,0 +1,11 @@ +tasks: +- print: "**** done start wait..." +- 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 +- print: "**** done end wait..." diff --git a/qa/suites/upgrade/octopus-x/distro$ b/qa/suites/upgrade/octopus-x/distro$ new file mode 120000 index 0000000000000..b9db0a58015c1 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/distro$ @@ -0,0 +1 @@ +../../rados/cephadm/smoke/distro/ \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/fixed-2.yaml b/qa/suites/upgrade/octopus-x/fixed-2.yaml new file mode 100644 index 0000000000000..5ad2eb38fd179 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/fixed-2.yaml @@ -0,0 +1,32 @@ +roles: +- - mon.a + - mon.c + - mgr.y + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start + - node-exporter.a + - alertmanager.a +- - mon.b + - mgr.x + - mgr.z + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 + - prometheus.a + - grafana.a + - node-exporter.b +openstack: +- volumes: # attached to each instance + count: 4 + size: 10 # GB +overrides: + ceph: + conf: + osd: + osd shutdown pgref assert: true diff --git a/qa/suites/upgrade/octopus-x/mon_election b/qa/suites/upgrade/octopus-x/mon_election new file mode 120000 index 0000000000000..3f331e6214c4c --- /dev/null +++ b/qa/suites/upgrade/octopus-x/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/workload/+ b/qa/suites/upgrade/octopus-x/workload/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/upgrade/octopus-x/workload/rados_api.yaml b/qa/suites/upgrade/octopus-x/workload/rados_api.yaml new file mode 100644 index 0000000000000..f18e7d98db699 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/workload/rados_api.yaml @@ -0,0 +1,12 @@ +meta: +- desc: | + object class functional tests +workload: + full_sequential: + - print: "**** done start rados_api.yaml" + - workunit: + branch: octopus + clients: + client.0: + - cls + - print: "**** done end rados_api.yaml" diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml new file mode 100644 index 0000000000000..d7d8e3451708b --- /dev/null +++ b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml @@ -0,0 +1,12 @@ +#meta: +#- desc: | +# librbd C and C++ api tests +#workload: +# full_sequential: +# - print: "**** done start rbd/test_librbd.sh" +# - workunit: +# branch: octopus +# clients: +# client.0: +# - rbd/test_librbd.sh +# - print: "**** done end rbd/test_librbd.sh" -- 2.39.5