Skip to content

Commit 2972965

Browse files
emosbaughemosbaugh
authored
chore: various fixes (#2213)
* chore(ci): fix playwright errors * chore(ci): better e2e cmx cleanup * chore(ci): test verbosity too high * chore: unused code
1 parent f4f77a3 commit 2972965

File tree

10 files changed

+133
-92
lines changed

10 files changed

+133
-92
lines changed

‎cmd/installer/cli/cidr.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cli
22

33
import (
44
"fmt"
5-
"net"
65

76
k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
87
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
@@ -75,12 +74,3 @@ func getCIDRConfig(cmd *cobra.Command) (*newconfig.CIDRConfig, error) {
7574
GlobalCIDR: &globalCIDR,
7675
}, nil
7776
}
78-
79-
// cleanCIDR returns a `.0/x` subnet instead of a `.2/x` etc subnet
80-
func cleanCIDR(ipnet *net.IPNet) (string, error) {
81-
_, newNet, err := net.ParseCIDR(ipnet.String())
82-
if err != nil {
83-
return "", fmt.Errorf("failed to parse local inet CIDR %q: %w", ipnet.String(), err)
84-
}
85-
return newNet.String(), nil
86-
}

‎e2e/cluster/cmx/cluster.go

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ type Network struct {
5050

5151
func NewCluster(in *ClusterInput) *Cluster {
5252
c := &Cluster{t: in.T, supportBundleNodeIndex: in.SupportBundleNodeIndex}
53+
c.t.Cleanup(c.Destroy)
54+
5355
c.Nodes = make([]Node, in.Nodes)
5456

5557
network, err := NewNetwork(in)
@@ -60,11 +62,13 @@ func NewCluster(in *ClusterInput) *Cluster {
6062

6163
for i := range c.Nodes {
6264
node, err := NewNode(in, i, network.ID)
65+
if node != nil {
66+
c.Nodes[i] = *node
67+
}
6368
if err != nil {
6469
in.T.Fatalf("create node %d: %v", i, err)
6570
}
6671
in.T.Logf("node%d created with ID %s", i, node.ID)
67-
c.Nodes[i] = *node
6872
}
6973

7074
return c
@@ -94,7 +98,7 @@ func NewNetwork(in *ClusterInput) (*Network, error) {
9498
return network, nil
9599
}
96100

97-
func NewNode(in *ClusterInput, index int, networkID string) (*Node, error) {
101+
func NewNode(in *ClusterInput, index int, networkID string) (node *Node, err error) {
98102
nodeName := fmt.Sprintf("node%d", index)
99103
in.T.Logf("creating node %s", nodeName)
100104

@@ -136,42 +140,42 @@ func NewNode(in *ClusterInput, index int, networkID string) (*Node, error) {
136140
if len(nodes) != 1 {
137141
return nil, fmt.Errorf("expected 1 node, got %d", len(nodes))
138142
}
139-
node := nodes[0]
143+
node = &nodes[0]
140144

141145
// TODO (@salah): remove this once the bug is fixed in CMX
142146
// note: the vm gets marked as ready before the services are actually running
143147
time.Sleep(30 * time.Second)
144148

145149
sshEndpoint, err := getSSHEndpoint(node.ID)
146150
if err != nil {
147-
return nil, fmt.Errorf("get ssh endpoint for node %s: %v", nodeName, err)
151+
return node, fmt.Errorf("get ssh endpoint for node %s: %v", nodeName, err)
148152
}
149153
node.sshEndpoint = sshEndpoint
150154

151-
privateIP, err := discoverPrivateIP(node)
155+
privateIP, err := discoverPrivateIP(*node)
152156
if err != nil {
153-
return nil, fmt.Errorf("discover node private IP: %v", err)
157+
return node, fmt.Errorf("discover node private IP: %v", err)
154158
}
155159
node.privateIP = privateIP
156160

157-
if err := ensureAssetsDir(node); err != nil {
158-
return nil, fmt.Errorf("ensure assets dir on node %s: %v", node.Name, err)
161+
if err := ensureAssetsDir(*node); err != nil {
162+
return node, fmt.Errorf("ensure assets dir on node %s: %v", node.Name, err)
159163
}
160164

161-
if err := copyScriptsToNode(node); err != nil {
162-
return nil, fmt.Errorf("copy scripts to node %s: %v", node.Name, err)
165+
if err := copyScriptsToNode(*node); err != nil {
166+
return node, fmt.Errorf("copy scripts to node %s: %v", node.Name, err)
163167
}
164168

165169
if index == 0 {
166170
in.T.Logf("exposing port 30003 on node %s", node.Name)
167-
hostname, err := exposePort(node, "30003")
171+
hostname, err := exposePort(*node, "30003")
168172
if err != nil {
169-
return nil, fmt.Errorf("expose port: %v", err)
173+
return node, fmt.Errorf("expose port: %v", err)
170174
}
171175
node.adminConsoleURL = fmt.Sprintf("http://%s", hostname)
172176
}
173177

174-
return &node, nil
178+
return node, nil
175179
}
176180

177181
func discoverPrivateIP(node Node) (string, error) {
@@ -316,11 +320,31 @@ func (c *Cluster) Cleanup(envs ...map[string]string) {
316320
}
317321

318322
func (c *Cluster) Destroy() {
323+
if os.Getenv("SKIP_CMX_CLEANUP") != "" {
324+
c.t.Logf("Skipping CMX cleanup")
325+
return
326+
}
327+
319328
for _, node := range c.Nodes {
320-
output, err := exec.Command("replicated", "vm", "rm", node.ID).CombinedOutput()
321-
if err != nil {
322-
c.t.Logf("failed to destroy node %s: %v: %s", node.Name, err, string(output))
323-
}
329+
c.removeNode(node)
330+
}
331+
332+
if c.network != nil {
333+
c.removeNetwork(*c.network)
334+
}
335+
}
336+
337+
func (c *Cluster) removeNode(node Node) {
338+
output, err := exec.Command("replicated", "vm", "rm", node.ID).CombinedOutput()
339+
if err != nil {
340+
c.t.Logf("failed to destroy node %s: %v: %s", node.Name, err, string(output))
341+
}
342+
}
343+
344+
func (c *Cluster) removeNetwork(network Network) {
345+
output, err := exec.Command("replicated", "network", "rm", network.ID).CombinedOutput()
346+
if err != nil {
347+
c.t.Logf("failed to destroy network %s: %v: %s", network.Name, err, string(output))
324348
}
325349
}
326350

@@ -387,7 +411,7 @@ func (c *Cluster) RunPlaywrightTest(testName string, args ...string) (string, st
387411
cmd.Stderr = &stderr
388412
err := cmd.Run()
389413
if err != nil {
390-
return stdout.String(), stderr.String(), fmt.Errorf("run playwright test %s: %v", testName, err)
414+
return stdout.String(), stderr.String(), err
391415
}
392416
return stdout.String(), stderr.String(), nil
393417
}

‎e2e/cluster/docker/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (c *Cluster) RunPlaywrightTest(testName string, args ...string) (string, st
140140
cmd.Stderr = &stderr
141141
err := cmd.Run()
142142
if err != nil {
143-
return stdout.String(), stderr.String(), fmt.Errorf("fail to run playwright test %s: %v", testName, err)
143+
return stdout.String(), stderr.String(), err
144144
}
145145
return stdout.String(), stderr.String(), nil
146146
}

‎e2e/cluster/lxd/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ func (c *Cluster) RunPlaywrightTest(testName string, args ...string) (string, st
11661166
}
11671167
stdout, stderr, err := c.RunCommandOnProxyNode(c.T, line, env)
11681168
if err != nil {
1169-
return stdout, stderr, fmt.Errorf("fail to run playwright test %s on node %s: %v", testName, c.Proxy, err)
1169+
return stdout, stderr, err
11701170
}
11711171
return stdout, stderr, nil
11721172
}

‎e2e/install_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,8 @@ func TestSingleNodeAirgapUpgrade(t *testing.T) {
663663
localArtifactMirrorPort: "50001", // choose an alternate lam port
664664
})
665665

666-
if _, _, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
667-
t.Fatalf("fail to run playwright test deploy-app: %v", err)
666+
if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
667+
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
668668
}
669669

670670
t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
@@ -685,8 +685,8 @@ func TestSingleNodeAirgapUpgrade(t *testing.T) {
685685
testArgs := []string{appUpgradeVersion}
686686

687687
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
688-
if _, _, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
689-
t.Fatalf("fail to run playwright test deploy-app: %v", err)
688+
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
689+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
690690
}
691691

692692
checkPostUpgradeState(t, tc)
@@ -734,8 +734,8 @@ func TestSingleNodeAirgapUpgradeCustomCIDR(t *testing.T) {
734734
cidr: "172.16.0.0/15",
735735
})
736736

737-
if _, _, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
738-
t.Fatalf("fail to run playwright test deploy-app: %v", err)
737+
if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
738+
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
739739
}
740740

741741
t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
@@ -754,8 +754,8 @@ func TestSingleNodeAirgapUpgradeCustomCIDR(t *testing.T) {
754754
testArgs := []string{appUpgradeVersion}
755755

756756
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
757-
if _, _, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
758-
t.Fatalf("fail to run playwright test deploy-app: %v", err)
757+
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
758+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
759759
}
760760

761761
checkPostUpgradeState(t, tc)
@@ -853,8 +853,8 @@ func TestAirgapUpgradeFromEC18(t *testing.T) {
853853
if err := tc.SetupPlaywright(withEnv); err != nil {
854854
t.Fatalf("fail to setup playwright: %v", err)
855855
}
856-
if _, _, err := tc.RunPlaywrightTest("deploy-ec18-app"); err != nil {
857-
t.Fatalf("fail to run playwright test deploy-ec18-app: %v", err)
856+
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-ec18-app"); err != nil {
857+
t.Fatalf("fail to run playwright test deploy-ec18-app: %v: %s: %s", err, stdout, stderr)
858858
}
859859

860860
// generate worker node join command.
@@ -928,7 +928,7 @@ func TestAirgapUpgradeFromEC18(t *testing.T) {
928928

929929
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
930930
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
931-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
931+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
932932
}
933933

934934
t.Logf("%s: checking installation state after noop upgrade", time.Now().Format(time.RFC3339))
@@ -957,7 +957,7 @@ func TestAirgapUpgradeFromEC18(t *testing.T) {
957957

958958
t.Logf("%s: upgrading cluster a second time", time.Now().Format(time.RFC3339))
959959
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
960-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
960+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
961961
}
962962

963963
t.Logf("%s: checking installation state after second upgrade", time.Now().Format(time.RFC3339))
@@ -1056,7 +1056,7 @@ func TestMultiNodeAirgapUpgradeSameK0s(t *testing.T) {
10561056

10571057
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
10581058
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1059-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1059+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
10601060
}
10611061

10621062
checkPostUpgradeState(t, tc)
@@ -1134,7 +1134,7 @@ func TestMultiNodeAirgapUpgrade(t *testing.T) {
11341134

11351135
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
11361136
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1137-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1137+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
11381138
}
11391139

11401140
checkPostUpgradeState(t, tc)
@@ -1226,7 +1226,7 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
12261226

12271227
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
12281228
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1229-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1229+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
12301230
}
12311231

12321232
t.Logf("%s: checking installation state after noop upgrade", time.Now().Format(time.RFC3339))
@@ -1246,7 +1246,7 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
12461246

12471247
t.Logf("%s: upgrading cluster a second time", time.Now().Format(time.RFC3339))
12481248
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1249-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1249+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
12501250
}
12511251

12521252
checkPostUpgradeStateWithOptions(t, tc, postUpgradeStateOptions{
@@ -1299,7 +1299,7 @@ func TestMultiNodeHAInstallation(t *testing.T) {
12991299

13001300
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
13011301
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1302-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1302+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
13031303
}
13041304

13051305
checkPostUpgradeState(t, tc)
@@ -1428,7 +1428,7 @@ func TestMultiNodeAirgapHAInstallation(t *testing.T) {
14281428

14291429
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
14301430
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1431-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1431+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
14321432
}
14331433

14341434
checkPostUpgradeState(t, tc)
@@ -1495,7 +1495,7 @@ func TestInstallSnapshotFromReplicatedApp(t *testing.T) {
14951495

14961496
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
14971497
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1498-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1498+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
14991499
}
15001500

15011501
checkPostUpgradeState(t, tc)
@@ -1589,7 +1589,7 @@ func TestSingleNodeInstallationNoopUpgrade(t *testing.T) {
15891589

15901590
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
15911591
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1592-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1592+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
15931593
}
15941594

15951595
checkInstallationStateWithOptions(t, tc, installationStateOptions{
@@ -1717,7 +1717,7 @@ func TestFiveNodesAirgapUpgrade(t *testing.T) {
17171717
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
17181718
testArgs := []string{fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))}
17191719
if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
1720-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1720+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
17211721
}
17221722

17231723
checkPostUpgradeState(t, tc)
@@ -1787,7 +1787,7 @@ spec:
17871787

17881788
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
17891789
if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-upgrade", testArgs...); err != nil {
1790-
t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
1790+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
17911791
}
17921792

17931793
checkPostUpgradeState(t, tc)
@@ -1886,8 +1886,8 @@ spec:
18861886
testArgs := []string{appUpgradeVersion, "", hostname}
18871887

18881888
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
1889-
if _, _, err := tc.SetupPlaywrightAndRunTest("deploy-upgrade", testArgs...); err != nil {
1890-
t.Fatalf("fail to run playwright test deploy-app: %v", err)
1889+
if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-upgrade", testArgs...); err != nil {
1890+
t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
18911891
}
18921892

18931893
checkPostUpgradeState(t, tc)

0 commit comments

Comments
 (0)