Skip to content

Commit

Permalink
Check for duplicate entries in generated Kairos config (#2023)
Browse files Browse the repository at this point in the history
fixed here: kairos-io/kairos-sdk#58

This commit makes sure we test this for regressions and pulls the fix in.

Signed-off-by: Dimitris Karakasilis <[email protected]>
  • Loading branch information
jimmykarily authored Nov 24, 2023
1 parent 08556b7 commit 3292b29
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions framework-profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ repositories:
priority: 2
urls:
- "quay.io/kairos/packages"
reference: 20231122160509-repository.yaml
reference: 20231123154748-repository.yaml
- !!merge <<: *kairos
arch: arm64
urls:
- "quay.io/kairos/packages-arm64"
reference: 20231122162944-repository.yaml
reference: 20231123162059-repository.yaml
7 changes: 7 additions & 0 deletions tests/bundles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ var _ = Describe("kairos bundles test", Label("bundles-test"), func() {
Expect(err).ToNot(HaveOccurred(), ipfsV)
Expect(ipfsV).To(ContainSubstring("0.15.0"))
})

By("checking that there are no duplicate entries in the config (issue#2019)", func() {
out, _ := vm.Sudo("cat /oem/90_custom.yaml")
// https://pkg.go.dev/regexp/syntax
// ?s -> "let . match \n (default false)"
Expect(out).ToNot(MatchRegexp("(?s)ttl.sh.*ttl.sh"))
})
})
})
})

0 comments on commit 3292b29

Please sign in to comment.