From a70277e24e668648e01198e4798220e14477deb6 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 14 Dec 2023 15:08:42 +0100 Subject: [PATCH 1/2] add 1.54 and 1.56 to integration tests Signed-off-by: Kristoffer Dalby --- integration/scenario.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration/scenario.go b/integration/scenario.go index 6bcd5852b2..d5dcbe62c7 100644 --- a/integration/scenario.go +++ b/integration/scenario.go @@ -44,7 +44,9 @@ var ( tailscaleVersions2021 = map[string]bool{ "head": true, "unstable": true, - "1.52": true, // CapVer: + "1.56": true, // CapVer: 82 + "1.54": true, // CapVer: 79 + "1.52": true, // CapVer: 79 "1.50": true, // CapVer: 74 "1.48": true, // CapVer: 68 "1.46": true, // CapVer: 65 From ca17d279c8d7400ab0cbb9cc918968633528c409 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 14 Dec 2023 17:11:59 +0100 Subject: [PATCH 2/2] fix bug where we tested random versions, now sorted Signed-off-by: Kristoffer Dalby --- integration/scenario.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integration/scenario.go b/integration/scenario.go index d5dcbe62c7..015d669862 100644 --- a/integration/scenario.go +++ b/integration/scenario.go @@ -6,6 +6,7 @@ import ( "log" "net/netip" "os" + "sort" "sync" v1 "github.com/juanfont/headscale/gen/go/headscale/v1" @@ -31,6 +32,8 @@ func enabledVersions(vs map[string]bool) []string { } } + sort.Sort(sort.Reverse(sort.StringSlice(ret))) + return ret } @@ -355,7 +358,7 @@ func (s *Scenario) CreateTailscaleNodesInUser( return err } - log.Printf("testing versions %v", lo.Uniq(versions)) + log.Printf("testing versions %v, MustTestVersions %v", lo.Uniq(versions), MustTestVersions) return nil }