From f6aafa92d0865e79705f900e915c88ccb0be5a9b Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 18 Jan 2019 12:53:05 -0800 Subject: [PATCH] qa/tests: changed to `supported' distro and moved all `p2p` suites under the same folder Signed-off-by: Yuri Weinstein --- qa/suites/upgrade/luminous-p2p-stress-split/distros | 1 - .../upgrade/luminous-p2p-stress-split/thrashosds-health.yaml | 1 - qa/suites/upgrade/luminous-p2p/.qa | 1 - .../luminous-p2p-parallel}/% | 0 qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/.qa | 1 + .../{ => luminous-p2p-parallel}/point-to-point-upgrade.yaml | 0 qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/supported | 1 + qa/suites/upgrade/luminous-p2p/{ => luminous-p2p-stress-split}/% | 0 .../{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/+ | 0 .../{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/.qa | 0 .../luminous-p2p-stress-split/0-cluster/openstack.yaml | 0 .../luminous-p2p-stress-split/0-cluster/start.yaml | 0 .../luminous-p2p-stress-split/1-ceph-install/luminous.yaml | 0 .../1.1-pg-log-overrides/normal_pg_log.yaml | 0 .../1.1-pg-log-overrides/short_pg_log.yaml | 0 .../luminous-p2p-stress-split/2-partial-upgrade/.qa | 0 .../luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml | 0 .../{ => luminous-p2p}/luminous-p2p-stress-split/3-thrash/.qa | 0 .../luminous-p2p-stress-split/3-thrash/default.yaml | 0 .../{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/+ | 0 .../{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/.qa | 0 .../luminous-p2p-stress-split/4-workload/radosbench.yaml | 0 .../luminous-p2p-stress-split/4-workload/rbd-cls.yaml | 0 .../luminous-p2p-stress-split/4-workload/rbd-import-export.yaml | 0 .../luminous-p2p-stress-split/4-workload/rbd_api.yaml | 0 .../luminous-p2p-stress-split/4-workload/readwrite.yaml | 0 .../luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml | 0 .../luminous-p2p-stress-split/5-finish-upgrade.yaml | 0 .../luminous-p2p-stress-split/7-final-workload/+ | 0 .../luminous-p2p-stress-split/7-final-workload/.qa | 0 .../luminous-p2p-stress-split/7-final-workload/rbd-python.yaml | 0 .../luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml | 0 .../7-final-workload/snaps-many-objects.yaml | 0 .../upgrade/luminous-p2p/luminous-p2p-stress-split/supported | 1 + .../luminous-p2p-stress-split/thrashosds-health.yaml | 1 + qa/suites/upgrade/luminous-p2p/supported | 1 - 36 files changed, 4 insertions(+), 4 deletions(-) delete mode 120000 qa/suites/upgrade/luminous-p2p-stress-split/distros delete mode 120000 qa/suites/upgrade/luminous-p2p-stress-split/thrashosds-health.yaml delete mode 120000 qa/suites/upgrade/luminous-p2p/.qa rename qa/suites/upgrade/{luminous-p2p-stress-split => luminous-p2p/luminous-p2p-parallel}/% (100%) create mode 120000 qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/.qa rename qa/suites/upgrade/luminous-p2p/{ => luminous-p2p-parallel}/point-to-point-upgrade.yaml (100%) create mode 120000 qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/supported rename qa/suites/upgrade/luminous-p2p/{ => luminous-p2p-stress-split}/% (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/+ (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/.qa (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/openstack.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/0-cluster/start.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/1-ceph-install/luminous.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/1.1-pg-log-overrides/normal_pg_log.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/1.1-pg-log-overrides/short_pg_log.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/2-partial-upgrade/.qa (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/3-thrash/.qa (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/3-thrash/default.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/+ (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/.qa (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/radosbench.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/rbd-cls.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/rbd-import-export.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/rbd_api.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/readwrite.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/5-finish-upgrade.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/7-final-workload/+ (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/7-final-workload/.qa (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/7-final-workload/rbd-python.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml (100%) rename qa/suites/upgrade/{ => luminous-p2p}/luminous-p2p-stress-split/7-final-workload/snaps-many-objects.yaml (100%) create mode 120000 qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/supported create mode 120000 qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/thrashosds-health.yaml delete mode 120000 qa/suites/upgrade/luminous-p2p/supported diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/distros b/qa/suites/upgrade/luminous-p2p-stress-split/distros deleted file mode 120000 index dd0d7f1d5bdca..0000000000000 --- a/qa/suites/upgrade/luminous-p2p-stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported/ \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/thrashosds-health.yaml b/qa/suites/upgrade/luminous-p2p-stress-split/thrashosds-health.yaml deleted file mode 120000 index ebf7f34f39bcf..0000000000000 --- a/qa/suites/upgrade/luminous-p2p-stress-split/thrashosds-health.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p/.qa b/qa/suites/upgrade/luminous-p2p/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/upgrade/luminous-p2p/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/% b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/% similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/% rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/% diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/.qa new file mode 120000 index 0000000000000..a23f7e045836b --- /dev/null +++ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/.qa @@ -0,0 +1 @@ +../../.qa \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p/point-to-point-upgrade.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/point-to-point-upgrade.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p/point-to-point-upgrade.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/point-to-point-upgrade.yaml diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/supported b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/supported new file mode 120000 index 0000000000000..79010c36a5998 --- /dev/null +++ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-parallel/supported @@ -0,0 +1 @@ +../../../../distros/supported \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p/% b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/% similarity index 100% rename from qa/suites/upgrade/luminous-p2p/% rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/% diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/+ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/+ similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/+ rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/+ diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/.qa similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/.qa rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/.qa diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/openstack.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/openstack.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/openstack.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/start.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/start.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/0-cluster/start.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/0-cluster/start.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1-ceph-install/luminous.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/1-ceph-install/luminous.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1-ceph-install/luminous.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1.1-pg-log-overrides/normal_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/1.1-pg-log-overrides/normal_pg_log.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1.1-pg-log-overrides/normal_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1.1-pg-log-overrides/short_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/1.1-pg-log-overrides/short_pg_log.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/1.1-pg-log-overrides/short_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/2-partial-upgrade/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/2-partial-upgrade/.qa similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/2-partial-upgrade/.qa rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/2-partial-upgrade/.qa diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/2-partial-upgrade/firsthalf.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/3-thrash/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/3-thrash/.qa similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/3-thrash/.qa rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/3-thrash/.qa diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/3-thrash/default.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/3-thrash/default.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/3-thrash/default.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/3-thrash/default.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/+ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/+ rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/+ diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/.qa rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/.qa diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/radosbench.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/radosbench.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/radosbench.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/radosbench.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd-cls.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd-cls.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd-cls.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd-import-export.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd-import-export.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd-import-export.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd_api.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/rbd_api.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/rbd_api.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/readwrite.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/readwrite.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/readwrite.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/readwrite.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/4-workload/snaps-few-objects.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/5-finish-upgrade.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/5-finish-upgrade.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/5-finish-upgrade.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/+ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/+ rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/+ diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/.qa b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/.qa rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/.qa diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rbd-python.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/rbd-python.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rbd-python.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml diff --git a/qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/snaps-many-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-p2p-stress-split/7-final-workload/snaps-many-objects.yaml rename to qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/snaps-many-objects.yaml diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/supported b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/supported new file mode 120000 index 0000000000000..79010c36a5998 --- /dev/null +++ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/supported @@ -0,0 +1 @@ +../../../../distros/supported \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/thrashosds-health.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/thrashosds-health.yaml new file mode 120000 index 0000000000000..e0426dbe49935 --- /dev/null +++ b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/thrashosds-health.yaml @@ -0,0 +1 @@ +../../../../tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-p2p/supported b/qa/suites/upgrade/luminous-p2p/supported deleted file mode 120000 index dd0d7f1d5bdca..0000000000000 --- a/qa/suites/upgrade/luminous-p2p/supported +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported/ \ No newline at end of file -- 2.39.5