use errorgroup and get errors from setup

Signed-off-by: Kristoffer Dalby <[email protected]>

integration/general_test.go

@@ -407,9 +407,8 @@ func TestResolveMagicDNS(t *testing.T) {
  defer scenario.Shutdown()
 
  spec := map[string]int{
- // Omit 1.16.2 (-1) because it does not have the FQDN field
- "magicdns1": len(MustTestVersions) - 1,
- "magicdns2": len(MustTestVersions) - 1,
+ "magicdns1": len(MustTestVersions),
+ "magicdns2": len(MustTestVersions),
  }
 
  err = scenario.CreateHeadscaleEnv(spec, []tsic.Option{}, hsic.WithTestName("magicdns"))

integration/scenario.go

@@ -32,18 +32,18 @@ var (
  // Tailscale started adding TS2021 support in CapabilityVersion>=28 (v1.24.0), but
  // proper support in Headscale was only added for CapabilityVersion>=39 clients (v1.30.0).
  tailscaleVersions2021 = []string{
- // "head",
+ "head",
  "unstable",
  "1.48",
  "1.46",
  "1.44",
- // "1.42",
- // "1.40",
- // "1.38",
- // "1.36",
- // "1.34",
- // "1.32",
- // "1.30",
+ "1.42",
+ "1.40",
+ "1.38",
+ "1.36",
+ "1.34",
+ "1.32",
+ "1.30",
  }
 
  tailscaleVersions2019 = []string{
@@ -74,7 +74,7 @@ var (
  // found in Tailscale's apt repository.
  AllVersions = append(
  tailscaleVersions2021,
- // tailscaleVersions2019...,
+ tailscaleVersions2019...,
  )
 
  // MustTestVersions is the minimum set of versions we should test.