[TEST] use before/after and consolidate #14560

Job	Run time
Run cypress tests (osd:ciGroup1)	19m 51s
Run cypress tests (osd:ciGroup2)	22m 6s
Run cypress tests (osd:ciGroup3)	20m 34s
Run cypress tests (osd:ciGroup4)	19m 1s
Run cypress tests (osd:ciGroup5)	18m 39s
Run cypress tests (osd:ciGroup6)	34m 32s
Run cypress tests (osd:ciGroup7)	22m 3s
Run cypress tests (osd:ciGroup8)	21m 18s
Run cypress tests (osd:ciGroup9)	21m 32s
Run cypress tests (osd:ciGroup10)	1h 13m 2s
Run cypress tests (osd:ciGroup11)	18m 39s
Run cypress tests (osd:ciGroup12)	1h 3m 9s
Run cypress tests (osd:ciGroup13)	46m 26s
Run cypress tests (osd:ciGroup14)	46m 40s
Run cypress tests (osd:ciGroup15)	1h 26m 54s
add-comment	0s
	8h 54m 26s

Provide feedback