From: Sage Weil Date: Fri, 14 May 2021 15:40:02 +0000 (-0500) Subject: qa/suites: move rados/cephadm -> orch/cephadm; symlink X-Git-Tag: v17.1.0~1921^2~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5b25f8a2e51ccdea1f5409a4b8e55f8e625c8193;p=ceph-ci.git qa/suites: move rados/cephadm -> orch/cephadm; symlink Move cephadm under orch/ top-level suite. Symlink so that we still include it in a rados run. Signed-off-by: Sage Weil --- diff --git a/qa/suites/orch/cephadm/.qa b/qa/suites/orch/cephadm/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/dashboard/% b/qa/suites/orch/cephadm/dashboard/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/dashboard/.qa b/qa/suites/orch/cephadm/dashboard/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/dashboard/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/dashboard/0-distro/.qa b/qa/suites/orch/cephadm/dashboard/0-distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/dashboard/0-distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml new file mode 120000 index 00000000000..3afeed74d50 --- /dev/null +++ b/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml b/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml new file mode 100644 index 00000000000..cb6ffb22fe0 --- /dev/null +++ b/qa/suites/orch/cephadm/dashboard/task/test_e2e.yaml @@ -0,0 +1,23 @@ +roles: +# 3 osd roles on host.a is required for cephadm task. It checks if the cluster is healthy. +# More daemons will be deployed on both hosts in e2e tests. +- - host.a + - osd.0 + - osd.1 + - osd.2 + - mon.a + - mgr.a + - client.0 +- - host.b + - client.1 +tasks: +- install: +- cephadm: +- workunit: + clients: + client.1: + - cephadm/create_iscsi_disks.sh +- workunit: + clients: + client.0: + - cephadm/test_dashboard_e2e.sh diff --git a/qa/suites/orch/cephadm/orchestrator_cli/% b/qa/suites/orch/cephadm/orchestrator_cli/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/orchestrator_cli/.qa b/qa/suites/orch/cephadm/orchestrator_cli/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/orchestrator_cli/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ new file mode 120000 index 00000000000..d2dffb18188 --- /dev/null +++ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ @@ -0,0 +1 @@ +../smoke/distro \ No newline at end of file diff --git a/qa/suites/orch/cephadm/orchestrator_cli/2-node-mgr.yaml b/qa/suites/orch/cephadm/orchestrator_cli/2-node-mgr.yaml new file mode 120000 index 00000000000..8a0b9123b38 --- /dev/null +++ b/qa/suites/orch/cephadm/orchestrator_cli/2-node-mgr.yaml @@ -0,0 +1 @@ +.qa/clusters/2-node-mgr.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/orchestrator_cli/orchestrator_cli.yaml b/qa/suites/orch/cephadm/orchestrator_cli/orchestrator_cli.yaml new file mode 100644 index 00000000000..564a2eb0252 --- /dev/null +++ b/qa/suites/orch/cephadm/orchestrator_cli/orchestrator_cli.yaml @@ -0,0 +1,18 @@ + +tasks: + - install: + - ceph: + # tests may leave mgrs broken, so don't try and call into them + # to invoke e.g. pg dump during teardown. + wait-for-scrub: false + log-ignorelist: + - overall HEALTH_ + - \(MGR_DOWN\) + - \(DEVICE_IDENT_ON\) + - \(DEVICE_FAULT_ON\) + - \(PG_ + - replacing it with standby + - No standby daemons available + - cephfs_test_runner: + modules: + - tasks.mgr.test_orchestrator_cli \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-roleless/% b/qa/suites/orch/cephadm/smoke-roleless/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/smoke-roleless/.qa b/qa/suites/orch/cephadm/smoke-roleless/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-roleless/0-distro b/qa/suites/orch/cephadm/smoke-roleless/0-distro new file mode 120000 index 00000000000..d2dffb18188 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/0-distro @@ -0,0 +1 @@ +../smoke/distro \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml new file mode 100644 index 00000000000..2ca0d0e0086 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml @@ -0,0 +1,32 @@ +tasks: +- cephadm: + roleless: true +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls +roles: +- - host.a + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +- - host.b + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 +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/orch/cephadm/smoke-roleless/2-services/basic.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/basic.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/client-keyring.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/client-keyring.yaml new file mode 100644 index 00000000000..f0080047111 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/client-keyring.yaml @@ -0,0 +1,40 @@ +tasks: +- cephadm.shell: + host.a: + - ceph orch host label add `hostname` foo + - ceph auth get-or-create client.foo mon 'allow r' + - ceph orch client-keyring set client.foo label:foo --mode 770 --owner 11111:22222 +- exec: + host.a: + - while ! test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done + - ls -al /etc/ceph/ceph.client.foo.keyring | grep rwxrwx--- + - ls -al /etc/ceph/ceph.client.foo.keyring | grep 11111 + - ls -al /etc/ceph/ceph.client.foo.keyring | grep 22222 + - test -e /etc/ceph/ceph.conf +- exec: + host.b: + - test ! -e /etc/ceph/ceph.client.foo.keyring +- cephadm.shell: + host.b: + - ceph orch host label add `hostname` foo +- exec: + host.b: + - while ! test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done + - ls -al /etc/ceph/ceph.client.foo.keyring | grep rwxrwx--- + - ls -al /etc/ceph/ceph.client.foo.keyring | grep 11111 + - ls -al /etc/ceph/ceph.client.foo.keyring | grep 22222 +- cephadm.shell: + host.b: + - ceph orch host label rm `hostname` foo +- exec: + host.b: + - while test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done +- exec: + host.a: + - test -e /etc/ceph/ceph.client.foo.keyring +- cephadm.shell: + host.a: + - ceph orch client-keyring rm client.foo +- exec: + host.a: + - while test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/iscsi.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/iscsi.yaml new file mode 100644 index 00000000000..7f57076dbe2 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/iscsi.yaml @@ -0,0 +1,8 @@ +tasks: +- cephadm.shell: + host.a: + - ceph osd pool create foo + - rbd pool init foo + - ceph orch apply iscsi foo u p +- cephadm.wait_for_service: + service: iscsi.foo diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/mirror.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/mirror.yaml new file mode 100644 index 00000000000..681e1e04ac7 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/mirror.yaml @@ -0,0 +1,9 @@ +tasks: +- cephadm.shell: + host.a: + - ceph orch apply rbd-mirror "--placement=*" + - ceph orch apply cephfs-mirror "--placement=*" +- cephadm.wait_for_service: + service: rbd-mirror +- cephadm.wait_for_service: + service: cephfs-mirror diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml new file mode 100644 index 00000000000..710edab7375 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml @@ -0,0 +1,60 @@ +tasks: +- vip: + +# make sure cephadm notices the new IP +- cephadm.shell: + host.a: + - ceph orch device ls --refresh + +# deploy rgw + ingress +- cephadm.apply: + specs: + - service_type: rgw + service_id: foo + placement: + count: 4 + host_pattern: "*" + spec: + rgw_frontend_port: 8000 + - service_type: ingress + service_id: rgw.foo + placement: + count: 2 + spec: + backend_service: rgw.foo + frontend_port: 9000 + monitor_port: 9001 + virtual_ip: "{{VIP0}}/{{VIPPREFIXLEN}}" +- cephadm.wait_for_service: + service: rgw.foo +- cephadm.wait_for_service: + service: ingress.rgw.foo + +# take each component down in turn and ensure things still work +- cephadm.shell: + host.a: + - | + echo "Check while healthy..." + curl http://{{VIP0}}:9000/ + + # stop each rgw in turn + echo "Check with each rgw stopped in turn..." + for rgw in `ceph orch ps | grep ^rgw.foo. | awk '{print $1}'`; do + ceph orch daemon stop $rgw + while ! ceph orch ps | grep $rgw | grep stopped; do sleep 1 ; done + while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done + ceph orch daemon start $rgw + while ! ceph orch ps | grep $rgw | grep running; do sleep 1 ; done + done + + # stop each haproxy in turn + echo "Check with each haproxy down in turn..." + for haproxy in `ceph orch ps | grep ^haproxy.rgw.foo. | awk '{print $1}'`; do + ceph orch daemon stop $haproxy + while ! ceph orch ps | grep $haproxy | grep stopped; do sleep 1 ; done + while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done + ceph orch daemon start $haproxy + while ! ceph orch ps | grep $haproxy | grep running; do sleep 1 ; done + done + + while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw.yaml new file mode 100644 index 00000000000..cb2c6f4b6b8 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw.yaml @@ -0,0 +1,12 @@ +tasks: +- cephadm.apply: + specs: + - service_type: rgw + service_id: foo + placement: + count_per_host: 4 + host_pattern: "*" + spec: + rgw_frontend_port: 8000 +- cephadm.wait_for_service: + service: rgw.foo diff --git a/qa/suites/orch/cephadm/smoke-roleless/3-final.yaml b/qa/suites/orch/cephadm/smoke-roleless/3-final.yaml new file mode 100644 index 00000000000..02f5b289c1a --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-roleless/3-final.yaml @@ -0,0 +1,8 @@ +tasks: +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls diff --git a/qa/suites/orch/cephadm/smoke-singlehost/% b/qa/suites/orch/cephadm/smoke-singlehost/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ b/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ new file mode 120000 index 00000000000..d2dffb18188 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ @@ -0,0 +1 @@ +../smoke/distro \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml b/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml new file mode 100644 index 00000000000..ca6019c66cf --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml @@ -0,0 +1,27 @@ +tasks: +- cephadm: + roleless: true + single_host_defaults: true +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls +roles: +- - host.a + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +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/orch/cephadm/smoke-singlehost/2-services/basic.yaml b/qa/suites/orch/cephadm/smoke-singlehost/2-services/basic.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/smoke-singlehost/2-services/rgw.yaml b/qa/suites/orch/cephadm/smoke-singlehost/2-services/rgw.yaml new file mode 100644 index 00000000000..cb2c6f4b6b8 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-singlehost/2-services/rgw.yaml @@ -0,0 +1,12 @@ +tasks: +- cephadm.apply: + specs: + - service_type: rgw + service_id: foo + placement: + count_per_host: 4 + host_pattern: "*" + spec: + rgw_frontend_port: 8000 +- cephadm.wait_for_service: + service: rgw.foo diff --git a/qa/suites/orch/cephadm/smoke-singlehost/3-final.yaml b/qa/suites/orch/cephadm/smoke-singlehost/3-final.yaml new file mode 100644 index 00000000000..02f5b289c1a --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-singlehost/3-final.yaml @@ -0,0 +1,8 @@ +tasks: +- cephadm.shell: + host.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls diff --git a/qa/suites/orch/cephadm/smoke/% b/qa/suites/orch/cephadm/smoke/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/smoke/.qa b/qa/suites/orch/cephadm/smoke/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/.qa b/qa/suites/orch/cephadm/smoke/distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml new file mode 120000 index 00000000000..3afeed74d50 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml b/qa/suites/orch/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml new file mode 120000 index 00000000000..20f0f7c55ea --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml @@ -0,0 +1 @@ +.qa/distros/podman/rhel_8.3_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml b/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml new file mode 120000 index 00000000000..cfb85f10ef5 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml b/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml new file mode 120000 index 00000000000..162964882d3 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/fixed-2.yaml b/qa/suites/orch/cephadm/smoke/fixed-2.yaml new file mode 100644 index 00000000000..e93564aa9da --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/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.foo.a + - node-exporter.a + - alertmanager.a +- - mon.b + - mgr.x + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 + - prometheus.a + - grafana.a + - node-exporter.b + - ceph.iscsi.iscsi.a +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/orch/cephadm/smoke/mon_election b/qa/suites/orch/cephadm/smoke/mon_election new file mode 120000 index 00000000000..3f331e6214c --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/start.yaml b/qa/suites/orch/cephadm/smoke/start.yaml new file mode 100644 index 00000000000..f45b922bc1a --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -0,0 +1,14 @@ +tasks: +- cephadm: + conf: + mgr: + debug ms: 1 + debug mgr: 20 +- cephadm.shell: + mon.a: + - ceph orch status + - ceph orch ps + - ceph orch ls + - ceph orch host ls + - ceph orch device ls + - ceph orch ls --format yaml diff --git a/qa/suites/orch/cephadm/thrash/% b/qa/suites/orch/cephadm/thrash/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/thrash/.qa b/qa/suites/orch/cephadm/thrash/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/0-distro b/qa/suites/orch/cephadm/thrash/0-distro new file mode 120000 index 00000000000..f0db8bb61f8 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/0-distro @@ -0,0 +1 @@ +../workunits/0-distro \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/1-start.yaml b/qa/suites/orch/cephadm/thrash/1-start.yaml new file mode 100644 index 00000000000..a1b89e44db8 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/1-start.yaml @@ -0,0 +1,7 @@ +tasks: +- install: +- cephadm: + conf: + mgr: + debug ms: 1 + debug mgr: 20 diff --git a/qa/suites/orch/cephadm/thrash/2-thrash.yaml b/qa/suites/orch/cephadm/thrash/2-thrash.yaml new file mode 100644 index 00000000000..05e0f8e76d1 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/2-thrash.yaml @@ -0,0 +1,26 @@ +overrides: + ceph: + log-ignorelist: + - but it is still running + - objects unfound and apparently lost + conf: + osd: + osd debug reject backfill probability: .3 + osd scrub min interval: 60 + osd scrub max interval: 120 + osd max backfills: 3 + osd snap trim sleep: 2 + osd delete sleep: 1 + mon: + mon min osdmap epochs: 50 + paxos service trim min: 10 + # prune full osdmaps regularly + mon osdmap full prune min: 15 + mon osdmap full prune interval: 2 + mon osdmap full prune txsize: 2 +tasks: +- thrashosds: + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgnum_shrink: 1 + chance_pgpnum_fix: 1 diff --git a/qa/suites/orch/cephadm/thrash/3-tasks/.qa b/qa/suites/orch/cephadm/thrash/3-tasks/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/3-tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/3-tasks/rados_api_tests.yaml b/qa/suites/orch/cephadm/thrash/3-tasks/rados_api_tests.yaml new file mode 120000 index 00000000000..34e657e0448 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/3-tasks/rados_api_tests.yaml @@ -0,0 +1 @@ +.qa/suites/rados/thrash/workloads/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/3-tasks/radosbench.yaml b/qa/suites/orch/cephadm/thrash/3-tasks/radosbench.yaml new file mode 120000 index 00000000000..dad17e0de13 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/3-tasks/radosbench.yaml @@ -0,0 +1 @@ +.qa/suites/rados/thrash/workloads/radosbench.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/3-tasks/small-objects.yaml b/qa/suites/orch/cephadm/thrash/3-tasks/small-objects.yaml new file mode 120000 index 00000000000..6aa66aa374d --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/3-tasks/small-objects.yaml @@ -0,0 +1 @@ +.qa/suites/rados/thrash/workloads/small-objects.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/3-tasks/snaps-few-objects.yaml b/qa/suites/orch/cephadm/thrash/3-tasks/snaps-few-objects.yaml new file mode 120000 index 00000000000..c9cc4cd3ea2 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/3-tasks/snaps-few-objects.yaml @@ -0,0 +1 @@ +.qa/suites/rados/thrash/workloads/snaps-few-objects.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/fixed-2.yaml b/qa/suites/orch/cephadm/thrash/fixed-2.yaml new file mode 120000 index 00000000000..5c3e0593cbc --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/fixed-2.yaml @@ -0,0 +1 @@ +../smoke/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/msgr b/qa/suites/orch/cephadm/thrash/msgr new file mode 120000 index 00000000000..57bee80db00 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/msgr @@ -0,0 +1 @@ +.qa/msgr \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/root.yaml b/qa/suites/orch/cephadm/thrash/root.yaml new file mode 100644 index 00000000000..bedb31d5d67 --- /dev/null +++ b/qa/suites/orch/cephadm/thrash/root.yaml @@ -0,0 +1,3 @@ +overrides: + cephadm: + cephadm_mode: root diff --git a/qa/suites/orch/cephadm/upgrade/% b/qa/suites/orch/cephadm/upgrade/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/upgrade/.qa b/qa/suites/orch/cephadm/upgrade/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml new file mode 100644 index 00000000000..2e551dd4391 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml @@ -0,0 +1,42 @@ +os_type: centos +os_version: "8.3" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 + +tasks: +- cephadm: + image: quay.ceph.io/ceph-ci/ceph:octopus + cephadm_branch: octopus + cephadm_git_url: https://github.com/ceph/ceph + # avoid --cap-add=PTRACE + --privileged for older cephadm versions + allow_ptrace: false + # deploy additional mons the "old" (octopus) way + add_mons_via_daemon_add: true + avoid_pacific_features: true + + +roles: +- - mon.a + - mon.c + - mgr.y + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +# - ceph.rgw.realm.zone.a # CLI change in v16 pacific + - node-exporter.a + - alertmanager.a +- - mon.b + - mgr.x + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 + - prometheus.a + - grafana.a + - node-exporter.b + - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml new file mode 100644 index 00000000000..fde68b32aa4 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml @@ -0,0 +1,37 @@ +os_type: ubuntu +os_version: "20.04" + +tasks: +- cephadm: + image: docker.io/ceph/ceph:v15.2.9 + cephadm_branch: v15.2.9 + cephadm_git_url: https://github.com/ceph/ceph + # avoid --cap-add=PTRACE + --privileged for older cephadm versions + allow_ptrace: false + # deploy additional mons the "old" (octopus) way + add_mons_via_daemon_add: true + avoid_pacific_features: true + +roles: +- - mon.a + - mon.c + - mgr.y + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - client.0 +# - ceph.rgw.realm.zone.a # CLI change in v16 pacific + - node-exporter.a + - alertmanager.a +- - mon.b + - mgr.x + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 + - prometheus.a + - grafana.a + - node-exporter.b + - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml new file mode 100644 index 00000000000..983b4f3dc92 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml @@ -0,0 +1,37 @@ +os_type: ubuntu +os_version: "20.04" + +tasks: +- cephadm: + image: docker.io/ceph/ceph:v15.2.0 + cephadm_branch: v15.2.0 + cephadm_git_url: https://github.com/ceph/ceph + # avoid --cap-add=PTRACE + --privileged for older cephadm versions + allow_ptrace: false + # deploy additional mons the "old" (octopus) way + add_mons_via_daemon_add: true + avoid_pacific_features: true + +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 + - osd.4 + - osd.5 + - osd.6 + - osd.7 + - client.1 + - prometheus.a + - grafana.a + - node-exporter.b +# - ceph.iscsi.iscsi.a # needs later start point diff --git a/qa/suites/orch/cephadm/upgrade/2-repo_digest/defaut.yaml b/qa/suites/orch/cephadm/upgrade/2-repo_digest/defaut.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/upgrade/2-repo_digest/repo_digest.yaml b/qa/suites/orch/cephadm/upgrade/2-repo_digest/repo_digest.yaml new file mode 100644 index 00000000000..2e6bbfd921a --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/2-repo_digest/repo_digest.yaml @@ -0,0 +1,4 @@ +tasks: +- cephadm.shell: + mon.a: + - ceph config set mgr mgr/cephadm/use_repo_digest false --force diff --git a/qa/suites/orch/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/orch/cephadm/upgrade/3-start-upgrade.yaml new file mode 100644 index 00000000000..80463a6c075 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/3-start-upgrade.yaml @@ -0,0 +1,13 @@ +tasks: +- cephadm.shell: + env: [sha1] + mon.a: + - radosgw-admin realm create --rgw-realm=r --default + - radosgw-admin zonegroup create --rgw-zonegroup=default --master --default + - radosgw-admin zone create --rgw-zonegroup=default --rgw-zone=z --master --default + - radosgw-admin period update --rgw-realm=r --commit + - ceph orch apply rgw r z --placement=2 --port=8000 + - sleep 120 + - 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 orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 diff --git a/qa/suites/orch/cephadm/upgrade/4-wait.yaml b/qa/suites/orch/cephadm/upgrade/4-wait.yaml new file mode 100644 index 00000000000..e71143dafe4 --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/4-wait.yaml @@ -0,0 +1,13 @@ +tasks: +- 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 + - 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 diff --git a/qa/suites/orch/cephadm/upgrade/mon_election b/qa/suites/orch/cephadm/upgrade/mon_election new file mode 120000 index 00000000000..3f331e6214c --- /dev/null +++ b/qa/suites/orch/cephadm/upgrade/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/% b/qa/suites/orch/cephadm/with-work/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/with-work/.qa b/qa/suites/orch/cephadm/with-work/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/0-distro b/qa/suites/orch/cephadm/with-work/0-distro new file mode 120000 index 00000000000..92c9153eac7 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/0-distro @@ -0,0 +1 @@ +../smoke/distro/ \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/fixed-2.yaml b/qa/suites/orch/cephadm/with-work/fixed-2.yaml new file mode 120000 index 00000000000..5c3e0593cbc --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/fixed-2.yaml @@ -0,0 +1 @@ +../smoke/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/mode/.qa b/qa/suites/orch/cephadm/with-work/mode/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/mode/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/mode/packaged.yaml b/qa/suites/orch/cephadm/with-work/mode/packaged.yaml new file mode 100644 index 00000000000..ba8d432189e --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/mode/packaged.yaml @@ -0,0 +1,5 @@ +overrides: + cephadm: + cephadm_mode: cephadm-package + install: + extra_packages: [cephadm] diff --git a/qa/suites/orch/cephadm/with-work/mode/root.yaml b/qa/suites/orch/cephadm/with-work/mode/root.yaml new file mode 100644 index 00000000000..bedb31d5d67 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/mode/root.yaml @@ -0,0 +1,3 @@ +overrides: + cephadm: + cephadm_mode: root diff --git a/qa/suites/orch/cephadm/with-work/mon_election b/qa/suites/orch/cephadm/with-work/mon_election new file mode 120000 index 00000000000..3f331e6214c --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/msgr b/qa/suites/orch/cephadm/with-work/msgr new file mode 120000 index 00000000000..57bee80db00 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/msgr @@ -0,0 +1 @@ +.qa/msgr \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/start.yaml b/qa/suites/orch/cephadm/with-work/start.yaml new file mode 100644 index 00000000000..a1b89e44db8 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/start.yaml @@ -0,0 +1,7 @@ +tasks: +- install: +- cephadm: + conf: + mgr: + debug ms: 1 + debug mgr: 20 diff --git a/qa/suites/orch/cephadm/with-work/tasks/.qa b/qa/suites/orch/cephadm/with-work/tasks/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/tasks/rados_api_tests.yaml b/qa/suites/orch/cephadm/with-work/tasks/rados_api_tests.yaml new file mode 120000 index 00000000000..2ce80f969c0 --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/tasks/rados_api_tests.yaml @@ -0,0 +1 @@ +.qa/suites/rados/basic/tasks/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/tasks/rados_python.yaml b/qa/suites/orch/cephadm/with-work/tasks/rados_python.yaml new file mode 120000 index 00000000000..210ad8f18bc --- /dev/null +++ b/qa/suites/orch/cephadm/with-work/tasks/rados_python.yaml @@ -0,0 +1 @@ +.qa/suites/rados/basic/tasks/rados_python.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/% b/qa/suites/orch/cephadm/workunits/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/orch/cephadm/workunits/.qa b/qa/suites/orch/cephadm/workunits/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/.qa b/qa/suites/orch/cephadm/workunits/0-distro/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/0-distro/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml new file mode 120000 index 00000000000..3afeed74d50 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/mon_election b/qa/suites/orch/cephadm/workunits/mon_election new file mode 120000 index 00000000000..3f331e6214c --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/task/test_adoption.yaml b/qa/suites/orch/cephadm/workunits/task/test_adoption.yaml new file mode 100644 index 00000000000..e04fc1eea3c --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/task/test_adoption.yaml @@ -0,0 +1,11 @@ +roles: +- [mon.a, mgr.x, osd.0, client.0] +tasks: +- install: +- exec: + mon.a: + - yum install -y python3 || apt install -y python3 +- workunit: + clients: + client.0: + - cephadm/test_adoption.sh diff --git a/qa/suites/orch/cephadm/workunits/task/test_cephadm.yaml b/qa/suites/orch/cephadm/workunits/task/test_cephadm.yaml new file mode 100644 index 00000000000..4d253517cc9 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/task/test_cephadm.yaml @@ -0,0 +1,11 @@ +roles: +- [mon.a, mgr.x, osd.0, client.0] +tasks: +- install: +- exec: + mon.a: + - yum install -y python3 || apt install -y python3 +- workunit: + clients: + client.0: + - cephadm/test_cephadm.sh diff --git a/qa/suites/orch/cephadm/workunits/task/test_cephadm_repos.yaml b/qa/suites/orch/cephadm/workunits/task/test_cephadm_repos.yaml new file mode 100644 index 00000000000..4a1ac88de14 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/task/test_cephadm_repos.yaml @@ -0,0 +1,8 @@ +roles: +- [mon.a, mgr.x, osd.0, client.0] +tasks: +- workunit: + no_coverage_and_limits: true + clients: + client.0: + - cephadm/test_repos.sh diff --git a/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml b/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml new file mode 100644 index 00000000000..b6287212342 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml @@ -0,0 +1,18 @@ +roles: +- - host.a + - osd.0 + - osd.1 + - osd.2 + - mon.a + - mgr.a + - client.0 +tasks: +- install: +- cephadm: +- cephadm.shell: + host.a: + - ceph orch apply mds a +- cephfs_test_runner: + modules: + - tasks.cephfs.test_nfs + - tasks.cephadm_cases.test_cli diff --git a/qa/suites/rados/cephadm b/qa/suites/rados/cephadm new file mode 120000 index 00000000000..0e8b6774d9d --- /dev/null +++ b/qa/suites/rados/cephadm @@ -0,0 +1 @@ +../orch/cephadm \ No newline at end of file diff --git a/qa/suites/rados/cephadm/.qa b/qa/suites/rados/cephadm/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/dashboard/% b/qa/suites/rados/cephadm/dashboard/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/dashboard/.qa b/qa/suites/rados/cephadm/dashboard/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/dashboard/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/dashboard/0-distro/.qa b/qa/suites/rados/cephadm/dashboard/0-distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/dashboard/0-distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/rados/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/dashboard/task/test_e2e.yaml b/qa/suites/rados/cephadm/dashboard/task/test_e2e.yaml deleted file mode 100644 index cb6ffb22fe0..00000000000 --- a/qa/suites/rados/cephadm/dashboard/task/test_e2e.yaml +++ /dev/null @@ -1,23 +0,0 @@ -roles: -# 3 osd roles on host.a is required for cephadm task. It checks if the cluster is healthy. -# More daemons will be deployed on both hosts in e2e tests. -- - host.a - - osd.0 - - osd.1 - - osd.2 - - mon.a - - mgr.a - - client.0 -- - host.b - - client.1 -tasks: -- install: -- cephadm: -- workunit: - clients: - client.1: - - cephadm/create_iscsi_disks.sh -- workunit: - clients: - client.0: - - cephadm/test_dashboard_e2e.sh diff --git a/qa/suites/rados/cephadm/orchestrator_cli/% b/qa/suites/rados/cephadm/orchestrator_cli/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/orchestrator_cli/.qa b/qa/suites/rados/cephadm/orchestrator_cli/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/orchestrator_cli/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/rados/cephadm/orchestrator_cli/0-random-distro$ deleted file mode 120000 index d2dffb18188..00000000000 --- a/qa/suites/rados/cephadm/orchestrator_cli/0-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro \ No newline at end of file diff --git a/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml b/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml deleted file mode 120000 index 8a0b9123b38..00000000000 --- a/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/clusters/2-node-mgr.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml b/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml deleted file mode 100644 index 564a2eb0252..00000000000 --- a/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml +++ /dev/null @@ -1,18 +0,0 @@ - -tasks: - - install: - - ceph: - # tests may leave mgrs broken, so don't try and call into them - # to invoke e.g. pg dump during teardown. - wait-for-scrub: false - log-ignorelist: - - overall HEALTH_ - - \(MGR_DOWN\) - - \(DEVICE_IDENT_ON\) - - \(DEVICE_FAULT_ON\) - - \(PG_ - - replacing it with standby - - No standby daemons available - - cephfs_test_runner: - modules: - - tasks.mgr.test_orchestrator_cli \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke-roleless/% b/qa/suites/rados/cephadm/smoke-roleless/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/smoke-roleless/.qa b/qa/suites/rados/cephadm/smoke-roleless/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke-roleless/0-distro b/qa/suites/rados/cephadm/smoke-roleless/0-distro deleted file mode 120000 index d2dffb18188..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/0-distro +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml b/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml deleted file mode 100644 index 2ca0d0e0086..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/1-start.yaml +++ /dev/null @@ -1,32 +0,0 @@ -tasks: -- cephadm: - roleless: true -- cephadm.shell: - host.a: - - ceph orch status - - ceph orch ps - - ceph orch ls - - ceph orch host ls - - ceph orch device ls -roles: -- - host.a - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 -- - host.b - - osd.4 - - osd.5 - - osd.6 - - osd.7 - - client.1 -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/rados/cephadm/smoke-roleless/2-services/basic.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/basic.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/client-keyring.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/client-keyring.yaml deleted file mode 100644 index f0080047111..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/2-services/client-keyring.yaml +++ /dev/null @@ -1,40 +0,0 @@ -tasks: -- cephadm.shell: - host.a: - - ceph orch host label add `hostname` foo - - ceph auth get-or-create client.foo mon 'allow r' - - ceph orch client-keyring set client.foo label:foo --mode 770 --owner 11111:22222 -- exec: - host.a: - - while ! test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done - - ls -al /etc/ceph/ceph.client.foo.keyring | grep rwxrwx--- - - ls -al /etc/ceph/ceph.client.foo.keyring | grep 11111 - - ls -al /etc/ceph/ceph.client.foo.keyring | grep 22222 - - test -e /etc/ceph/ceph.conf -- exec: - host.b: - - test ! -e /etc/ceph/ceph.client.foo.keyring -- cephadm.shell: - host.b: - - ceph orch host label add `hostname` foo -- exec: - host.b: - - while ! test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done - - ls -al /etc/ceph/ceph.client.foo.keyring | grep rwxrwx--- - - ls -al /etc/ceph/ceph.client.foo.keyring | grep 11111 - - ls -al /etc/ceph/ceph.client.foo.keyring | grep 22222 -- cephadm.shell: - host.b: - - ceph orch host label rm `hostname` foo -- exec: - host.b: - - while test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done -- exec: - host.a: - - test -e /etc/ceph/ceph.client.foo.keyring -- cephadm.shell: - host.a: - - ceph orch client-keyring rm client.foo -- exec: - host.a: - - while test -e /etc/ceph/ceph.client.foo.keyring ; do sleep 1 ; done diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml deleted file mode 100644 index 7f57076dbe2..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- cephadm.shell: - host.a: - - ceph osd pool create foo - - rbd pool init foo - - ceph orch apply iscsi foo u p -- cephadm.wait_for_service: - service: iscsi.foo diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml deleted file mode 100644 index 681e1e04ac7..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- cephadm.shell: - host.a: - - ceph orch apply rbd-mirror "--placement=*" - - ceph orch apply cephfs-mirror "--placement=*" -- cephadm.wait_for_service: - service: rbd-mirror -- cephadm.wait_for_service: - service: cephfs-mirror diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw-ingress.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw-ingress.yaml deleted file mode 100644 index 710edab7375..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw-ingress.yaml +++ /dev/null @@ -1,60 +0,0 @@ -tasks: -- vip: - -# make sure cephadm notices the new IP -- cephadm.shell: - host.a: - - ceph orch device ls --refresh - -# deploy rgw + ingress -- cephadm.apply: - specs: - - service_type: rgw - service_id: foo - placement: - count: 4 - host_pattern: "*" - spec: - rgw_frontend_port: 8000 - - service_type: ingress - service_id: rgw.foo - placement: - count: 2 - spec: - backend_service: rgw.foo - frontend_port: 9000 - monitor_port: 9001 - virtual_ip: "{{VIP0}}/{{VIPPREFIXLEN}}" -- cephadm.wait_for_service: - service: rgw.foo -- cephadm.wait_for_service: - service: ingress.rgw.foo - -# take each component down in turn and ensure things still work -- cephadm.shell: - host.a: - - | - echo "Check while healthy..." - curl http://{{VIP0}}:9000/ - - # stop each rgw in turn - echo "Check with each rgw stopped in turn..." - for rgw in `ceph orch ps | grep ^rgw.foo. | awk '{print $1}'`; do - ceph orch daemon stop $rgw - while ! ceph orch ps | grep $rgw | grep stopped; do sleep 1 ; done - while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done - ceph orch daemon start $rgw - while ! ceph orch ps | grep $rgw | grep running; do sleep 1 ; done - done - - # stop each haproxy in turn - echo "Check with each haproxy down in turn..." - for haproxy in `ceph orch ps | grep ^haproxy.rgw.foo. | awk '{print $1}'`; do - ceph orch daemon stop $haproxy - while ! ceph orch ps | grep $haproxy | grep stopped; do sleep 1 ; done - while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done - ceph orch daemon start $haproxy - while ! ceph orch ps | grep $haproxy | grep running; do sleep 1 ; done - done - - while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml deleted file mode 100644 index cb2c6f4b6b8..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: -- cephadm.apply: - specs: - - service_type: rgw - service_id: foo - placement: - count_per_host: 4 - host_pattern: "*" - spec: - rgw_frontend_port: 8000 -- cephadm.wait_for_service: - service: rgw.foo diff --git a/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml b/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml deleted file mode 100644 index 02f5b289c1a..00000000000 --- a/qa/suites/rados/cephadm/smoke-roleless/3-final.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- cephadm.shell: - host.a: - - ceph orch status - - ceph orch ps - - ceph orch ls - - ceph orch host ls - - ceph orch device ls diff --git a/qa/suites/rados/cephadm/smoke-singlehost/% b/qa/suites/rados/cephadm/smoke-singlehost/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ b/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ deleted file mode 120000 index d2dffb18188..00000000000 --- a/qa/suites/rados/cephadm/smoke-singlehost/0-distro$ +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml b/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml deleted file mode 100644 index ca6019c66cf..00000000000 --- a/qa/suites/rados/cephadm/smoke-singlehost/1-start.yaml +++ /dev/null @@ -1,27 +0,0 @@ -tasks: -- cephadm: - roleless: true - single_host_defaults: true -- cephadm.shell: - host.a: - - ceph orch status - - ceph orch ps - - ceph orch ls - - ceph orch host ls - - ceph orch device ls -roles: -- - host.a - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 -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/rados/cephadm/smoke-singlehost/2-services/basic.yaml b/qa/suites/rados/cephadm/smoke-singlehost/2-services/basic.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml deleted file mode 100644 index cb2c6f4b6b8..00000000000 --- a/qa/suites/rados/cephadm/smoke-singlehost/2-services/rgw.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: -- cephadm.apply: - specs: - - service_type: rgw - service_id: foo - placement: - count_per_host: 4 - host_pattern: "*" - spec: - rgw_frontend_port: 8000 -- cephadm.wait_for_service: - service: rgw.foo diff --git a/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml b/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml deleted file mode 100644 index 02f5b289c1a..00000000000 --- a/qa/suites/rados/cephadm/smoke-singlehost/3-final.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- cephadm.shell: - host.a: - - ceph orch status - - ceph orch ps - - ceph orch ls - - ceph orch host ls - - ceph orch device ls diff --git a/qa/suites/rados/cephadm/smoke/% b/qa/suites/rados/cephadm/smoke/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/smoke/.qa b/qa/suites/rados/cephadm/smoke/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/smoke/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/.qa b/qa/suites/rados/cephadm/smoke/distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml deleted file mode 120000 index 20f0f7c55ea..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/rhel_8.3_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml deleted file mode 120000 index cfb85f10ef5..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04.yaml deleted file mode 120000 index 162964882d3..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/fixed-2.yaml b/qa/suites/rados/cephadm/smoke/fixed-2.yaml deleted file mode 100644 index e93564aa9da..00000000000 --- a/qa/suites/rados/cephadm/smoke/fixed-2.yaml +++ /dev/null @@ -1,32 +0,0 @@ -roles: -- - mon.a - - mon.c - - mgr.y - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 - - ceph.rgw.foo.a - - node-exporter.a - - alertmanager.a -- - mon.b - - mgr.x - - osd.4 - - osd.5 - - osd.6 - - osd.7 - - client.1 - - prometheus.a - - grafana.a - - node-exporter.b - - ceph.iscsi.iscsi.a -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/rados/cephadm/smoke/mon_election b/qa/suites/rados/cephadm/smoke/mon_election deleted file mode 120000 index 3f331e6214c..00000000000 --- a/qa/suites/rados/cephadm/smoke/mon_election +++ /dev/null @@ -1 +0,0 @@ -.qa/mon_election \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/start.yaml b/qa/suites/rados/cephadm/smoke/start.yaml deleted file mode 100644 index f45b922bc1a..00000000000 --- a/qa/suites/rados/cephadm/smoke/start.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- cephadm: - conf: - mgr: - debug ms: 1 - debug mgr: 20 -- cephadm.shell: - mon.a: - - ceph orch status - - ceph orch ps - - ceph orch ls - - ceph orch host ls - - ceph orch device ls - - ceph orch ls --format yaml diff --git a/qa/suites/rados/cephadm/thrash/% b/qa/suites/rados/cephadm/thrash/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/thrash/.qa b/qa/suites/rados/cephadm/thrash/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/thrash/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/0-distro b/qa/suites/rados/cephadm/thrash/0-distro deleted file mode 120000 index f0db8bb61f8..00000000000 --- a/qa/suites/rados/cephadm/thrash/0-distro +++ /dev/null @@ -1 +0,0 @@ -../workunits/0-distro \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/1-start.yaml b/qa/suites/rados/cephadm/thrash/1-start.yaml deleted file mode 100644 index a1b89e44db8..00000000000 --- a/qa/suites/rados/cephadm/thrash/1-start.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- cephadm: - conf: - mgr: - debug ms: 1 - debug mgr: 20 diff --git a/qa/suites/rados/cephadm/thrash/2-thrash.yaml b/qa/suites/rados/cephadm/thrash/2-thrash.yaml deleted file mode 100644 index 05e0f8e76d1..00000000000 --- a/qa/suites/rados/cephadm/thrash/2-thrash.yaml +++ /dev/null @@ -1,26 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - but it is still running - - objects unfound and apparently lost - conf: - osd: - osd debug reject backfill probability: .3 - osd scrub min interval: 60 - osd scrub max interval: 120 - osd max backfills: 3 - osd snap trim sleep: 2 - osd delete sleep: 1 - mon: - mon min osdmap epochs: 50 - paxos service trim min: 10 - # prune full osdmaps regularly - mon osdmap full prune min: 15 - mon osdmap full prune interval: 2 - mon osdmap full prune txsize: 2 -tasks: -- thrashosds: - timeout: 1200 - chance_pgnum_grow: 1 - chance_pgnum_shrink: 1 - chance_pgpnum_fix: 1 diff --git a/qa/suites/rados/cephadm/thrash/3-tasks/.qa b/qa/suites/rados/cephadm/thrash/3-tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/thrash/3-tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/3-tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/thrash/3-tasks/rados_api_tests.yaml deleted file mode 120000 index 47e3355698c..00000000000 --- a/qa/suites/rados/cephadm/thrash/3-tasks/rados_api_tests.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../thrash/workloads/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/3-tasks/radosbench.yaml b/qa/suites/rados/cephadm/thrash/3-tasks/radosbench.yaml deleted file mode 120000 index 1e20917d880..00000000000 --- a/qa/suites/rados/cephadm/thrash/3-tasks/radosbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../thrash/workloads/radosbench.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/3-tasks/small-objects.yaml b/qa/suites/rados/cephadm/thrash/3-tasks/small-objects.yaml deleted file mode 120000 index 8dbb9cd2351..00000000000 --- a/qa/suites/rados/cephadm/thrash/3-tasks/small-objects.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../thrash/workloads/small-objects.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/3-tasks/snaps-few-objects.yaml b/qa/suites/rados/cephadm/thrash/3-tasks/snaps-few-objects.yaml deleted file mode 120000 index 9ee934490b1..00000000000 --- a/qa/suites/rados/cephadm/thrash/3-tasks/snaps-few-objects.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../thrash/workloads/snaps-few-objects.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/fixed-2.yaml b/qa/suites/rados/cephadm/thrash/fixed-2.yaml deleted file mode 120000 index 5c3e0593cbc..00000000000 --- a/qa/suites/rados/cephadm/thrash/fixed-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../smoke/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/msgr b/qa/suites/rados/cephadm/thrash/msgr deleted file mode 120000 index 57bee80db00..00000000000 --- a/qa/suites/rados/cephadm/thrash/msgr +++ /dev/null @@ -1 +0,0 @@ -.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/cephadm/thrash/root.yaml b/qa/suites/rados/cephadm/thrash/root.yaml deleted file mode 100644 index bedb31d5d67..00000000000 --- a/qa/suites/rados/cephadm/thrash/root.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - cephadm: - cephadm_mode: root diff --git a/qa/suites/rados/cephadm/upgrade/% b/qa/suites/rados/cephadm/upgrade/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/upgrade/.qa b/qa/suites/rados/cephadm/upgrade/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/upgrade/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml deleted file mode 100644 index 2e551dd4391..00000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml +++ /dev/null @@ -1,42 +0,0 @@ -os_type: centos -os_version: "8.3" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 - -tasks: -- cephadm: - image: quay.ceph.io/ceph-ci/ceph:octopus - cephadm_branch: octopus - cephadm_git_url: https://github.com/ceph/ceph - # avoid --cap-add=PTRACE + --privileged for older cephadm versions - allow_ptrace: false - # deploy additional mons the "old" (octopus) way - add_mons_via_daemon_add: true - avoid_pacific_features: true - - -roles: -- - mon.a - - mon.c - - mgr.y - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 -# - ceph.rgw.realm.zone.a # CLI change in v16 pacific - - node-exporter.a - - alertmanager.a -- - mon.b - - mgr.x - - osd.4 - - osd.5 - - osd.6 - - osd.7 - - client.1 - - prometheus.a - - grafana.a - - node-exporter.b - - ceph.iscsi.iscsi.a diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml deleted file mode 100644 index fde68b32aa4..00000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml +++ /dev/null @@ -1,37 +0,0 @@ -os_type: ubuntu -os_version: "20.04" - -tasks: -- cephadm: - image: docker.io/ceph/ceph:v15.2.9 - cephadm_branch: v15.2.9 - cephadm_git_url: https://github.com/ceph/ceph - # avoid --cap-add=PTRACE + --privileged for older cephadm versions - allow_ptrace: false - # deploy additional mons the "old" (octopus) way - add_mons_via_daemon_add: true - avoid_pacific_features: true - -roles: -- - mon.a - - mon.c - - mgr.y - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - client.0 -# - ceph.rgw.realm.zone.a # CLI change in v16 pacific - - node-exporter.a - - alertmanager.a -- - mon.b - - mgr.x - - osd.4 - - osd.5 - - osd.6 - - osd.7 - - client.1 - - prometheus.a - - grafana.a - - node-exporter.b - - ceph.iscsi.iscsi.a diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml deleted file mode 100644 index 983b4f3dc92..00000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml +++ /dev/null @@ -1,37 +0,0 @@ -os_type: ubuntu -os_version: "20.04" - -tasks: -- cephadm: - image: docker.io/ceph/ceph:v15.2.0 - cephadm_branch: v15.2.0 - cephadm_git_url: https://github.com/ceph/ceph - # avoid --cap-add=PTRACE + --privileged for older cephadm versions - allow_ptrace: false - # deploy additional mons the "old" (octopus) way - add_mons_via_daemon_add: true - avoid_pacific_features: true - -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 - - osd.4 - - osd.5 - - osd.6 - - osd.7 - - client.1 - - prometheus.a - - grafana.a - - node-exporter.b -# - ceph.iscsi.iscsi.a # needs later start point diff --git a/qa/suites/rados/cephadm/upgrade/2-repo_digest/defaut.yaml b/qa/suites/rados/cephadm/upgrade/2-repo_digest/defaut.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml b/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml deleted file mode 100644 index 2e6bbfd921a..00000000000 --- a/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- cephadm.shell: - mon.a: - - ceph config set mgr mgr/cephadm/use_repo_digest false --force diff --git a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml deleted file mode 100644 index 80463a6c075..00000000000 --- a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- cephadm.shell: - env: [sha1] - mon.a: - - radosgw-admin realm create --rgw-realm=r --default - - radosgw-admin zonegroup create --rgw-zonegroup=default --master --default - - radosgw-admin zone create --rgw-zonegroup=default --rgw-zone=z --master --default - - radosgw-admin period update --rgw-realm=r --commit - - ceph orch apply rgw r z --placement=2 --port=8000 - - sleep 120 - - 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 orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 diff --git a/qa/suites/rados/cephadm/upgrade/4-wait.yaml b/qa/suites/rados/cephadm/upgrade/4-wait.yaml deleted file mode 100644 index e71143dafe4..00000000000 --- a/qa/suites/rados/cephadm/upgrade/4-wait.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- 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 - - 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 diff --git a/qa/suites/rados/cephadm/upgrade/mon_election b/qa/suites/rados/cephadm/upgrade/mon_election deleted file mode 120000 index 3f331e6214c..00000000000 --- a/qa/suites/rados/cephadm/upgrade/mon_election +++ /dev/null @@ -1 +0,0 @@ -.qa/mon_election \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/% b/qa/suites/rados/cephadm/with-work/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/with-work/.qa b/qa/suites/rados/cephadm/with-work/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/with-work/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/0-distro b/qa/suites/rados/cephadm/with-work/0-distro deleted file mode 120000 index 92c9153eac7..00000000000 --- a/qa/suites/rados/cephadm/with-work/0-distro +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/fixed-2.yaml b/qa/suites/rados/cephadm/with-work/fixed-2.yaml deleted file mode 120000 index 5c3e0593cbc..00000000000 --- a/qa/suites/rados/cephadm/with-work/fixed-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../smoke/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/mode/.qa b/qa/suites/rados/cephadm/with-work/mode/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/with-work/mode/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/mode/packaged.yaml b/qa/suites/rados/cephadm/with-work/mode/packaged.yaml deleted file mode 100644 index ba8d432189e..00000000000 --- a/qa/suites/rados/cephadm/with-work/mode/packaged.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - cephadm: - cephadm_mode: cephadm-package - install: - extra_packages: [cephadm] diff --git a/qa/suites/rados/cephadm/with-work/mode/root.yaml b/qa/suites/rados/cephadm/with-work/mode/root.yaml deleted file mode 100644 index bedb31d5d67..00000000000 --- a/qa/suites/rados/cephadm/with-work/mode/root.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - cephadm: - cephadm_mode: root diff --git a/qa/suites/rados/cephadm/with-work/mon_election b/qa/suites/rados/cephadm/with-work/mon_election deleted file mode 120000 index 3f331e6214c..00000000000 --- a/qa/suites/rados/cephadm/with-work/mon_election +++ /dev/null @@ -1 +0,0 @@ -.qa/mon_election \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/msgr b/qa/suites/rados/cephadm/with-work/msgr deleted file mode 120000 index 57bee80db00..00000000000 --- a/qa/suites/rados/cephadm/with-work/msgr +++ /dev/null @@ -1 +0,0 @@ -.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/start.yaml b/qa/suites/rados/cephadm/with-work/start.yaml deleted file mode 100644 index a1b89e44db8..00000000000 --- a/qa/suites/rados/cephadm/with-work/start.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- cephadm: - conf: - mgr: - debug ms: 1 - debug mgr: 20 diff --git a/qa/suites/rados/cephadm/with-work/tasks/.qa b/qa/suites/rados/cephadm/with-work/tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/cephadm/with-work/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml deleted file mode 120000 index c771070987d..00000000000 --- a/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../basic/tasks/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml deleted file mode 120000 index 31ac6eadb73..00000000000 --- a/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../basic/tasks/rados_python.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/% b/qa/suites/rados/cephadm/workunits/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/cephadm/workunits/.qa b/qa/suites/rados/cephadm/workunits/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/workunits/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/0-distro/.qa b/qa/suites/rados/cephadm/workunits/0-distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/mon_election b/qa/suites/rados/cephadm/workunits/mon_election deleted file mode 120000 index 3f331e6214c..00000000000 --- a/qa/suites/rados/cephadm/workunits/mon_election +++ /dev/null @@ -1 +0,0 @@ -.qa/mon_election \ No newline at end of file diff --git a/qa/suites/rados/cephadm/workunits/task/test_adoption.yaml b/qa/suites/rados/cephadm/workunits/task/test_adoption.yaml deleted file mode 100644 index e04fc1eea3c..00000000000 --- a/qa/suites/rados/cephadm/workunits/task/test_adoption.yaml +++ /dev/null @@ -1,11 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, client.0] -tasks: -- install: -- exec: - mon.a: - - yum install -y python3 || apt install -y python3 -- workunit: - clients: - client.0: - - cephadm/test_adoption.sh diff --git a/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml b/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml deleted file mode 100644 index 4d253517cc9..00000000000 --- a/qa/suites/rados/cephadm/workunits/task/test_cephadm.yaml +++ /dev/null @@ -1,11 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, client.0] -tasks: -- install: -- exec: - mon.a: - - yum install -y python3 || apt install -y python3 -- workunit: - clients: - client.0: - - cephadm/test_cephadm.sh diff --git a/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml b/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml deleted file mode 100644 index 4a1ac88de14..00000000000 --- a/qa/suites/rados/cephadm/workunits/task/test_cephadm_repos.yaml +++ /dev/null @@ -1,8 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, client.0] -tasks: -- workunit: - no_coverage_and_limits: true - clients: - client.0: - - cephadm/test_repos.sh diff --git a/qa/suites/rados/cephadm/workunits/task/test_orch_cli.yaml b/qa/suites/rados/cephadm/workunits/task/test_orch_cli.yaml deleted file mode 100644 index b6287212342..00000000000 --- a/qa/suites/rados/cephadm/workunits/task/test_orch_cli.yaml +++ /dev/null @@ -1,18 +0,0 @@ -roles: -- - host.a - - osd.0 - - osd.1 - - osd.2 - - mon.a - - mgr.a - - client.0 -tasks: -- install: -- cephadm: -- cephadm.shell: - host.a: - - ceph orch apply mds a -- cephfs_test_runner: - modules: - - tasks.cephfs.test_nfs - - tasks.cephadm_cases.test_cli