mirror of
https://github.com/ceph/ceph
synced 2026-08-02 07:03:18 +00:00
Merge PR #67127 into main
* refs/pull/67127/head: qa/suites/upgrade: exclude rocky when Squid is involved qa/suites/upgrade: update upgrade paths Reviewed-by: Patrick Donnelly <pdonnell@ibm.com> Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
This commit is contained in:
Patrick Donnelly
commit
d64d998c09
@ -1 +1 @@
|
||||
../../upgrade/reef-x/parallel
|
||||
../../upgrade/squid-x/parallel
|
||||
@ -1,20 +0,0 @@
|
||||
overrides:
|
||||
ceph:
|
||||
log-ignorelist:
|
||||
- MDS_ALL_DOWN
|
||||
- MDS_UP_LESS_THAN_MAX
|
||||
- OSD_SLOW_PING_TIME
|
||||
- reached quota
|
||||
- running out of quota
|
||||
- overall HEALTH_
|
||||
- CACHE_POOL_NO_HIT_SET
|
||||
- pool\(s\) full
|
||||
- POOL_FULL
|
||||
- SMALLER_PGP_NUM
|
||||
- SLOW_OPS
|
||||
- CACHE_POOL_NEAR_FULL
|
||||
- OBJECT_MISPLACED
|
||||
- slow request
|
||||
- noscrub
|
||||
- nodeep-scrub
|
||||
- osds down
|
||||
@ -1,19 +0,0 @@
|
||||
overrides:
|
||||
ceph:
|
||||
log-ignorelist:
|
||||
- MDS_ALL_DOWN
|
||||
- MDS_UP_LESS_THAN_MAX
|
||||
- OSD_SLOW_PING_TIME
|
||||
- reached quota
|
||||
- running out of quota
|
||||
- overall HEALTH_
|
||||
- CACHE_POOL_NO_HIT_SET
|
||||
- pool\(s\) full
|
||||
- POOL_FULL
|
||||
- SMALLER_PGP_NUM
|
||||
- SLOW_OPS
|
||||
- CACHE_POOL_NEAR_FULL
|
||||
- OBJECT_MISPLACED
|
||||
- slow request
|
||||
- noscrub
|
||||
- nodeep-scrub
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream_runc.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/ubuntu_22.04.yaml
|
||||
@ -1 +0,0 @@
|
||||
.qa/distros/supported-container-hosts
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream_runc.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/ubuntu_22.04.yaml
|
||||
@ -1 +0,0 @@
|
||||
.qa/distros/supported-container-hosts
|
||||
@ -1 +0,0 @@
|
||||
.qa/distros/supported-container-hosts
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/centos_9.stream_runc.yaml
|
||||
@ -0,0 +1 @@
|
||||
.qa/distros/supported-container-hosts/ubuntu_22.04.yaml
|
||||
@ -27,22 +27,22 @@ overrides:
|
||||
- OBJECT_UNFOUND
|
||||
tasks:
|
||||
- install:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
exclude_packages:
|
||||
- ceph-volume
|
||||
- ceph-osd-classic
|
||||
- ceph-osd-crimson
|
||||
- print: "**** done install task..."
|
||||
- print: "**** done start installing reef cephadm ..."
|
||||
- print: "**** done start installing tentacle cephadm ..."
|
||||
- cephadm:
|
||||
image: quay.ceph.io/ceph-ci/ceph:reef
|
||||
compiled_cephadm_branch: reef
|
||||
image: quay.ceph.io/ceph-ci/ceph:tentacle
|
||||
compiled_cephadm_branch: tentacle
|
||||
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 reef cephadm ..."
|
||||
- print: "**** done end installing tentacle cephadm ..."
|
||||
|
||||
- print: "**** done start cephadm.shell ceph config set mgr..."
|
||||
- cephadm.shell:
|
||||
@ -50,12 +50,12 @@ tasks:
|
||||
- ceph config set mgr mgr/cephadm/use_repo_digest true --force
|
||||
- print: "**** done cephadm.shell ceph config set mgr..."
|
||||
|
||||
- print: "**** done start telemetry reef..."
|
||||
- print: "**** done start telemetry tentacle..."
|
||||
- workunit:
|
||||
clients:
|
||||
client.0:
|
||||
- test_telemetry_reef.sh
|
||||
- print: "**** done end telemetry reef..."
|
||||
- test_telemetry_tentacle.sh
|
||||
- print: "**** done end telemetry tentacle..."
|
||||
|
||||
- print: "**** done start upgrade sequence..."
|
||||
- sequential:
|
||||
@ -82,6 +82,6 @@ tasks:
|
||||
- workunit:
|
||||
clients:
|
||||
client.0:
|
||||
- test_telemetry_reef_x.sh
|
||||
- test_telemetry_tentacle_x.sh
|
||||
- print: "**** done end telemetry x..."
|
||||
- print: "**** done end upgrade sequence..."
|
||||
@ -56,3 +56,4 @@ overrides:
|
||||
- osds down
|
||||
- osd down
|
||||
- OBJECT_UNFOUND
|
||||
- PG_DEGRADED
|
||||
@ -5,22 +5,22 @@ overrides:
|
||||
- telemetry module includes new collections
|
||||
tasks:
|
||||
- install:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
exclude_packages:
|
||||
- ceph-osd-classic
|
||||
- ceph-volume
|
||||
- ceph-osd-crimson
|
||||
- print: "**** done install task..."
|
||||
- print: "**** done start installing reef cephadm ..."
|
||||
- print: "**** done start installing tentacle cephadm ..."
|
||||
- cephadm:
|
||||
image: quay.ceph.io/ceph-ci/ceph:reef
|
||||
compiled_cephadm_branch: reef
|
||||
image: quay.ceph.io/ceph-ci/ceph:tentacle
|
||||
compiled_cephadm_branch: tentacle
|
||||
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 reef cephadm ..."
|
||||
- print: "**** done end installing tentacle cephadm ..."
|
||||
|
||||
- print: "**** done start cephadm.shell ceph config set mgr..."
|
||||
- cephadm.shell:
|
||||
@ -28,12 +28,12 @@ tasks:
|
||||
- ceph config set mgr mgr/cephadm/use_repo_digest true --force
|
||||
- print: "**** done cephadm.shell ceph config set mgr..."
|
||||
|
||||
- print: "**** done start telemetry reef..."
|
||||
- print: "**** done start telemetry tentacle..."
|
||||
- workunit:
|
||||
clients:
|
||||
client.0:
|
||||
- test_telemetry_reef.sh
|
||||
- print: "**** done end telemetry reef..."
|
||||
- test_telemetry_tentacle.sh
|
||||
- print: "**** done end telemetry tentacle..."
|
||||
|
||||
- print: "**** done start parallel"
|
||||
- parallel:
|
||||
@ -45,5 +45,5 @@ tasks:
|
||||
- workunit:
|
||||
clients:
|
||||
client.0:
|
||||
- test_telemetry_reef_x.sh
|
||||
- test_telemetry_tentacle_x.sh
|
||||
- print: "**** done end telemetry x..."
|
||||
@ -0,0 +1,21 @@
|
||||
overrides:
|
||||
ceph:
|
||||
log-ignorelist:
|
||||
- \(MDS_ALL_DOWN\)
|
||||
- \(MDS_UP_LESS_THAN_MAX\)
|
||||
- \(OSD_SLOW_PING_TIME
|
||||
- reached quota
|
||||
- overall HEALTH_
|
||||
- \(CACHE_POOL_NO_HIT_SET\)
|
||||
- \(POOL_FULL\)
|
||||
- \(SMALLER_PGP_NUM\)
|
||||
- \(SLOW_OPS\)
|
||||
- \(CACHE_POOL_NEAR_FULL\)
|
||||
- \(POOL_APP_NOT_ENABLED\)
|
||||
- \(PG_AVAILABILITY\)
|
||||
- \(OBJECT_MISPLACED\)
|
||||
- slow request
|
||||
- \(MON_DOWN\)
|
||||
- noscrub
|
||||
- nodeep-scrub
|
||||
- osds down
|
||||
@ -5,7 +5,7 @@ workload:
|
||||
full_sequential:
|
||||
- print: "**** done start rados_api.yaml"
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- cls
|
||||
@ -5,7 +5,7 @@ workload:
|
||||
full_sequential:
|
||||
- print: "**** done start rados_loadgenbig.yaml"
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rados/load-gen-big.sh
|
||||
@ -5,7 +5,7 @@ workload:
|
||||
full_sequential:
|
||||
- print: "**** done start rbd_import_export.yaml"
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.1:
|
||||
- rbd/import_export.sh
|
||||
@ -5,7 +5,7 @@ workload:
|
||||
full_sequential:
|
||||
- print: "**** done start test_rbd_api.yaml"
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/test_librbd.sh
|
||||
@ -10,7 +10,7 @@ workload:
|
||||
full_sequential:
|
||||
- print: "**** done start test_rbd_python.yaml"
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/test_librbd_python.sh
|
||||
@ -31,14 +31,15 @@ overrides:
|
||||
- OBJECT_UNFOUND
|
||||
tasks:
|
||||
- install:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
exclude_packages:
|
||||
- ceph-volume
|
||||
- ceph-osd-classic
|
||||
- ceph-volume
|
||||
- ceph-osd-crimson
|
||||
|
||||
- cephadm:
|
||||
image: quay.ceph.io/ceph-ci/ceph:reef
|
||||
compiled_cephadm_branch: reef
|
||||
image: quay.ceph.io/ceph-ci/ceph:tentacle
|
||||
compiled_cephadm_branch: tentacle
|
||||
conf:
|
||||
osd:
|
||||
#set config option for which cls modules are allowed to be loaded / used
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
run basic cls tests for rbd
|
||||
first-half-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- cls/test_cls_rbd.sh
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
run basic import/export cli tests for rbd
|
||||
first-half-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/import_export.sh
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
librbd C and C++ api tests
|
||||
first-half-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/test_librbd.sh
|
||||
1
qa/suites/upgrade/tentacle-x/stress-split/3-stress-tasks/.qa
Symbolic link
1
qa/suites/upgrade/tentacle-x/stress-split/3-stress-tasks/.qa
Symbolic link
@ -0,0 +1 @@
|
||||
../.qa/
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
run basic cls tests for rbd
|
||||
stress-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- cls/test_cls_rbd.sh
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
run basic import/export cli tests for rbd
|
||||
stress-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/import_export.sh
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
librbd C and C++ api tests
|
||||
stress-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/test_librbd.sh
|
||||
@ -0,0 +1 @@
|
||||
../.qa/
|
||||
@ -3,7 +3,7 @@ meta:
|
||||
run basic import/export cli tests for rbd
|
||||
second-half-tasks:
|
||||
- workunit:
|
||||
branch: reef
|
||||
branch: tentacle
|
||||
clients:
|
||||
client.0:
|
||||
- rbd/import_export.sh
|
||||
1
qa/suites/upgrade/tentacle-x/stress-split/overrides/.qa
Symbolic link
1
qa/suites/upgrade/tentacle-x/stress-split/overrides/.qa
Symbolic link
@ -0,0 +1 @@
|
||||
../.qa/
|
||||
@ -0,0 +1,20 @@
|
||||
overrides:
|
||||
ceph:
|
||||
log-ignorelist:
|
||||
- \(MDS_ALL_DOWN\)
|
||||
- \(MDS_UP_LESS_THAN_MAX\)
|
||||
- \(OSD_SLOW_PING_TIME
|
||||
- reached quota
|
||||
- overall HEALTH_
|
||||
- \(CACHE_POOL_NO_HIT_SET\)
|
||||
- \(POOL_FULL\)
|
||||
- \(SMALLER_PGP_NUM\)
|
||||
- \(SLOW_OPS\)
|
||||
- \(CACHE_POOL_NEAR_FULL\)
|
||||
- \(POOL_APP_NOT_ENABLED\)
|
||||
- \(PG_AVAILABILITY\)
|
||||
- \(OBJECT_MISPLACED\)
|
||||
- slow request
|
||||
- \(MON_DOWN\)
|
||||
- noscrub
|
||||
- nodeep-scrub
|
||||
@ -30,7 +30,7 @@ ceph -s
|
||||
REPORTED_COLLECTIONS=$(ceph telemetry collection ls)
|
||||
NUM_REPORTED_COLLECTIONS=$(echo "$REPORTED_COLLECTIONS" | awk '/^NAME/ {flag=1; next} flag' | wc -l)
|
||||
KNOWN_COLLECTIONS=("basic_base" "basic_mds_metadata" "basic_pool_flags" "basic_pool_options_bluestore"
|
||||
"basic_pool_usage" "basic_rook_v01" "basic_usage_by_class" "crash_base"
|
||||
"basic_pool_usage" "basic_rook_v01" "basic_stretch_cluster" "basic_usage_by_class" "crash_base"
|
||||
"device_base" "ident_base" "perf_memory_metrics" "perf_perf")
|
||||
|
||||
if ! [[ $NUM_REPORTED_COLLECTIONS == "${#KNOWN_COLLECTIONS[@]}" ]];
|
||||
|
||||
@ -29,9 +29,9 @@ ceph -s
|
||||
# Verify collections
|
||||
REPORTED_COLLECTIONS=$(ceph telemetry collection ls)
|
||||
NUM_REPORTED_COLLECTIONS=$(echo "$REPORTED_COLLECTIONS" | awk '/^NAME/ {flag=1; next} flag' | wc -l)
|
||||
KNOWN_COLLECTIONS=("basic_base" "basic_mds_metadata" "basic_pool_options_bluestore"
|
||||
KNOWN_COLLECTIONS=("basic_base" "basic_mds_metadata" "basic_pool_flags" "basic_pool_options_bluestore"
|
||||
"basic_pool_usage" "basic_rook_v01" "basic_usage_by_class" "crash_base"
|
||||
"device_base" "ident_base" "perf_memory_metrics" "perf_perf")
|
||||
"device_base" "ident_base" "perf_memory_metrics" "perf_perf" "basic_stretch_cluster")
|
||||
|
||||
if ! [[ $NUM_REPORTED_COLLECTIONS == "${#KNOWN_COLLECTIONS[@]}" ]];
|
||||
then
|
||||
Loading…
Reference in New Issue
Block a user
