opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21002 from baude/machinee2edisksize

Browse Source 
machine e2e : set default disk size to 11
This commit is contained in:
openshift-merge-bot[bot]
2023-12-13 20:29:05 +00:00
committed by GitHub
parent 4582b61d7c 446df4379f
commit 7080d9980f
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/e2e/config_init_test.go
View File

@ -35,13 +35,15 @@ type initMachine struct {
} }
func (i *initMachine) buildCmd(m *machineTestBuilder) []string { func (i *initMachine) buildCmd(m *machineTestBuilder) []string {
diskSize := defaultDiskSize
cmd := []string{"machine", "init"} cmd := []string{"machine", "init"}
if i.cpus != nil { if i.cpus != nil {
cmd = append(cmd, "--cpus", strconv.Itoa(int(*i.cpus))) cmd = append(cmd, "--cpus", strconv.Itoa(int(*i.cpus)))
} }
if i.diskSize != nil { if i.diskSize != nil {
cmd = append(cmd, "--disk-size", strconv.Itoa(int(*i.diskSize))) diskSize = *i.diskSize
} }
cmd = append(cmd, "--disk-size", strconv.Itoa(int(diskSize)))
if l := len(i.ignitionPath); l > 0 { if l := len(i.ignitionPath); l > 0 {
cmd = append(cmd, "--ignition-path", i.ignitionPath) cmd = append(cmd, "--ignition-path", i.ignitionPath)
} }

3
pkg/machine/e2e/machine_test.go
View File

@ -25,7 +25,8 @@ func TestMain(m *testing.M) {
} }
const ( const (
defaultStream = machine.Testing defaultStream = machine.Testing
defaultDiskSize uint = 11
) )
var ( var (

3
pkg/machine/e2e/set_test.go
View File

@ -1,6 +1,7 @@
package e2e_test package e2e_test
import ( import (
"fmt"
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
@ -131,7 +132,7 @@ var _ = Describe("podman machine set", func() {
sshSession3, err := mb.setName(name).setCmd(ssh3.withSSHCommand([]string{"sudo", "fdisk", "-l", "|", "grep", "Disk"})).run() sshSession3, err := mb.setName(name).setCmd(ssh3.withSSHCommand([]string{"sudo", "fdisk", "-l", "|", "grep", "Disk"})).run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(sshSession3).To(Exit(0)) Expect(sshSession3).To(Exit(0))
Expect(sshSession3.outputToString()).To(ContainSubstring("100 GiB")) Expect(sshSession3.outputToString()).To(ContainSubstring(fmt.Sprintf("%d GiB", defaultDiskSize)))
}) })
It("set rootful with docker sock change", func() { It("set rootful with docker sock change", func() {