fix

cybozu-go · Dec 13, 2024 · 9a0a41b · 9a0a41b
1 parent 2924b0b
commit 9a0a41b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dctest/menu-ss.yml b/dctest/menu-ss.yml
@@ -63,7 +63,7 @@ spec:
   tpm: true
 ---
 kind: Node
-type: ss
+type: ss2
 spec:
   cpu: 4
   memory: 10G

diff --git a/dctest/sabakan_state_setter_test.go b/dctest/sabakan_state_setter_test.go
@@ -31,7 +31,13 @@ func testSabakanStateSetter() {
 		err = json.Unmarshal(stdout, &ssMachines)
 		Expect(err).ShouldNot(HaveOccurred(), "data=%s", stdout)
 
-		availableNodes := len(csMachines) + len(ssMachines)
+		stdout, stderr, err = execAt(bootServers[0], "sabactl", "machines", "get", "--role=ss2")
+		Expect(err).ShouldNot(HaveOccurred(), "stdout=%s, stderr=%s", stdout, stderr)
+		var ss2Machines []sabakan.Machine
+		err = json.Unmarshal(stdout, &ss2Machines)
+		Expect(err).ShouldNot(HaveOccurred(), "data=%s", stdout)
+
+		availableNodes := len(csMachines) + len(ssMachines) + len(ss2Machines)
 		Expect(availableNodes).NotTo(Equal(0))
 
 		By("checking all serf members are active")