Fix upgrade and migration tests #552

Job	Run time
Check distgen generated files	20s
Container tests: 11 - fedora	7s
Container tests: 11 - rhel8	5s
Container tests: 11 - rhel9	4s
Container tests: 11 - c9s	3s
Container tests: 11 - c10s	5m 12s
Container tests: 12 - fedora	20m 24s
Container tests: 12 - rhel8	1h 8m 54s
Container tests: 12 - rhel9	3s
Container tests: 12 - c9s	11s
Container tests: 12 - c10s	4s
Container tests: 13 - fedora	18m 53s
Container tests: 13 - rhel8	1h 8m 49s
Container tests: 13 - rhel9	1h 5m 47s
Container tests: 13 - c9s	20m 9s
Container tests: 13 - c10s	6s
Container tests: 14 - fedora	20m 11s
Container tests: 14 - rhel8	3s
Container tests: 14 - rhel9	3s
Container tests: 14 - c9s	3s
Container tests: 14 - c10s	3s
Container tests: 15 - fedora	20m 12s
Container tests: 15 - rhel8	1h 9m 54s
Container tests: 15 - rhel9	1h 5m 54s
Container tests: 15 - c9s	19m 41s
Container tests: 15 - c10s	3s
Container tests: 16 - fedora	19m 11s
Container tests: 16 - rhel8	1h 8m 58s
Container tests: 16 - rhel9	1h 6m 42s
Container tests: 16 - c9s	19m 49s
Container tests: 16 - c10s	3s
	10h 40m 1s

Provide feedback