fix: script location in make file, add Mycelium seed for batchK8sTest

threefoldtech · Oct 3, 2024 · 7f453d0 · 7f453d0
1 parent 549d404
commit 7f453d0
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 25 deletions.
diff --git a/grid-client/Makefile b/grid-client/Makefile
@@ -1,6 +1,6 @@
 PWD := $(shell pwd)
 GOPATH := $(shell go env GOPATH)
-integration_tests := $(shell go run scripts/scrap_tests.go)
+integration_tests := $(shell go run scripts/scrap_tests/scrap_tests.go)
 
 all: verifiers test
 

diff --git a/grid-client/integration_tests/batch_gateway_name_test.go b/grid-client/integration_tests/batch_gateway_name_test.go
@@ -106,6 +106,7 @@ func TestBatchGatewayNameDeployment(t *testing.T) {
 	require.NoError(t, err)
 	require.NotEmpty(t, g2.FQDN)
 
+	require.NotEmpty(t, v.MyceliumIP)
 	_, err = RemoteRun("root", v.MyceliumIP, "apk add python3; python3 -m http.server 9000 --bind :: &> /dev/null &", privateKey)
 	require.NoError(t, err)
 

diff --git a/grid-client/integration_tests/batch_k8s_test.go b/grid-client/integration_tests/batch_k8s_test.go
@@ -46,50 +46,70 @@ func TestBatchK8sDeployment(t *testing.T) {
 		require.NoError(t, err)
 	})
 
+	masterSeed1, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		t.Skipf("could not create master1 mycelium IP seed: %v", err)
+	}
+	masterSeed2, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		t.Skipf("could not create master2 mycelium IP seed: %v", err)
+	}
+	workerNodeSeed1, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		t.Skipf("could not create worker Node1 mycelium IP seed: %v", err)
+	}
+	workerNodeSeed2, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		t.Skipf("could not create worker Node2 mycelium IP seed: %v", err)
+	}
 	master1 := workloads.K8sNode{
 		VM: &workloads.VM{
-			Name:        generateRandString(10),
-			NetworkName: network.Name,
-			NodeID:      nodeID1,
-			Planetary:   true,
-			CPU:         minCPU,
-			MemoryMB:    minMemory * 1024,
+			Name:           generateRandString(10),
+			NetworkName:    network.Name,
+			NodeID:         nodeID1,
+			Planetary:      true,
+			CPU:            minCPU,
+			MemoryMB:       minMemory * 1024,
+			MyceliumIPSeed: masterSeed1,
 		},
 		DiskSizeGB: 1,
 	}
 
 	master2 := workloads.K8sNode{
 		VM: &workloads.VM{
-			Name:        generateRandString(10),
-			NetworkName: network.Name,
-			NodeID:      nodeID2,
-			Planetary:   true,
-			CPU:         minCPU,
-			MemoryMB:    minMemory * 1024,
+			Name:           generateRandString(10),
+			NetworkName:    network.Name,
+			NodeID:         nodeID2,
+			Planetary:      true,
+			CPU:            minCPU,
+			MemoryMB:       minMemory * 1024,
+			MyceliumIPSeed: masterSeed2,
 		},
 		DiskSizeGB: 1,
 	}
 
 	workerNodeData1 := workloads.K8sNode{
 		VM: &workloads.VM{
-			Name:        generateRandString(10),
-			NetworkName: network.Name,
-			NodeID:      nodeID1,
-			Planetary:   true,
-			CPU:         minCPU,
-			MemoryMB:    minMemory * 1024,
+			Name:           generateRandString(10),
+			NetworkName:    network.Name,
+			NodeID:         nodeID1,
+			Planetary:      true,
+			CPU:            minCPU,
+			MemoryMB:       minMemory * 1024,
+			MyceliumIPSeed: workerNodeSeed1,
 		},
 		DiskSizeGB: 1,
 	}
 
 	workerNodeData2 := workloads.K8sNode{
 		VM: &workloads.VM{
-			Name:        generateRandString(10),
-			NetworkName: network.Name,
-			NodeID:      nodeID2,
-			Planetary:   true,
-			CPU:         minCPU,
-			MemoryMB:    minMemory * 1024,
+			Name:           generateRandString(10),
+			NetworkName:    network.Name,
+			NodeID:         nodeID2,
+			Planetary:      true,
+			CPU:            minCPU,
+			MemoryMB:       minMemory * 1024,
+			MyceliumIPSeed: workerNodeSeed2,
 		},
 		DiskSizeGB: 1,
 	}