Repository navigation
Commit 661c5a2
committed
fix(tests): keep two unit tests green after the release image restamp
The release build rewrites packages/*/values.yaml: the kube-ovn image tag
becomes the Cozystack version and the traces collector becomes the
first-party otelcol-tracing build. Two unit tests read exactly those
fields, so every PR against release-1.7 has failed Unit & controller
tests since the first rc:
- hack/cni-plugins-staging-contract.bats compared the multus marker with
the values.yaml tag. It now reads appVersion from the vendored kube-ovn
chart, which is what packages/system/kubeovn/Makefile builds from and
what a release build leaves alone.
- vtraces_collector_test.yaml matched the upstream collector image name.
It now sets the cluster images-registry and checks that it lands in
front of the rendered image and that the image stays digest-pinned:
that is the cozy-lib.image helper's behaviour, and it holds on main
and on a release branch alike. Removing the helper from the template
makes the case fail; a name regex did not notice.
The same patch applies to main as #5180.
Assisted-by: LLM
Signed-off-by: Marian Koreniuk <[email protected]>1 parent a32334a commit 661c5a2
2 files changed
Lines changed: 15 additions & 6 deletions
File tree
- hack
- packages/system/monitoring/tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
27 | 30 | | |
28 | 31 | | |
| |||
347 | 350 | | |
348 | 351 | | |
349 | 352 | | |
350 | | - | |
351 | | - | |
352 | | - | |
| 353 | + | |
| 354 | + | |
353 | 355 | | |
354 | 356 | | |
355 | 357 | | |
356 | | - | |
| 358 | + | |
357 | 359 | | |
358 | 360 | | |
359 | 361 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
473 | 473 | | |
474 | 474 | | |
475 | 475 | | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
476 | 480 | | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
477 | 484 | | |
478 | 485 | | |
479 | 486 | | |
480 | 487 | | |
481 | 488 | | |
482 | 489 | | |
483 | | - | |
| 490 | + | |
0 commit comments