Skip to content

Commit b20ae88

Browse files
chore: update soci version to 0.11.1 for vm (#1500)
Signed-off-by: Shubhranshu Mahapatra <[email protected]>
1 parent f756907 commit b20ae88

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

e2e/vm/soci_remote_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
const (
23-
ffmpegSociImage = "public.ecr.aws/soci-workshop-examples/ffmpeg:latest"
23+
ffmpegSociImage = "public.ecr.aws/soci-workshop-examples/ffmpeg_v2:latest"
2424
registryImage = "public.ecr.aws/docker/library/registry:latest"
2525
ubuntuImage = "public.ecr.aws/docker/library/ubuntu:23.10"
2626
sociMountString = "fuse.rawBridge"
@@ -59,6 +59,7 @@ var testSoci = func(o *option.Option, installed bool) {
5959
"sudo", "nerdctl", "--snapshotter=soci", "pull", ffmpegSociImage).WithTimeoutInSeconds(30).Run()
6060
nerdctlPullMounts := countMounts(limactlO)
6161
command.Run(o, "rmi", "-f", ffmpegSociImage)
62+
gomega.Expect(finchPullMounts).ShouldNot(gomega.BeZero())
6263
gomega.Expect(finchPullMounts).Should(gomega.Equal(nerdctlPullMounts))
6364
})
6465

@@ -68,13 +69,14 @@ var testSoci = func(o *option.Option, installed bool) {
6869
writeFile(finchConfigFilePath, []byte(fmt.Sprintf("cpus: 6\nmemory: 4GiB\nsnapshotters:\n "+
6970
"- soci\nvmType: %s\nrosetta: false", vmType)))
7071
command.New(o, virtualMachineRootCmd, "init").WithoutCheckingExitCode().WithTimeoutInSeconds(160).Run()
71-
command.New(o, "run", "--snapshotter=soci", ffmpegSociImage).WithTimeoutInSeconds(30).Run()
72+
command.New(o, "run", "--snapshotter=soci", ffmpegSociImage, "-version").WithTimeoutInSeconds(30).Run()
7273
finchPullMounts := countMounts(limactlO)
7374
command.Run(o, "rmi", "-f", ffmpegSociImage)
7475
command.New(limactlO, "shell", "finch",
75-
"sudo", "nerdctl", "--snapshotter=soci", "run", ffmpegSociImage).WithTimeoutInSeconds(30).Run()
76+
"sudo", "nerdctl", "--snapshotter=soci", "run", ffmpegSociImage, "-version").WithTimeoutInSeconds(30).Run()
7677
nerdctlPullMounts := countMounts(limactlO)
7778
command.Run(o, "rmi", "-f", ffmpegSociImage)
79+
gomega.Expect(finchPullMounts).ShouldNot(gomega.BeZero())
7880
gomega.Expect(finchPullMounts).Should(gomega.Equal(nerdctlPullMounts))
7981
})
8082
ginkgo.It("finch push should work", func() {
@@ -104,6 +106,6 @@ var testSoci = func(o *option.Option, installed bool) {
104106

105107
// counts the mounts present in the VM after pulling an image.
106108
func countMounts(limactlO *option.Option) int {
107-
mountOutput := command.StdoutStr(limactlO, "shell", "finch", "mount")
109+
mountOutput := command.StdoutStr(limactlO, "shell", "finch", "mount", "--type=fuse.rawBridge")
108110
return strings.Count(mountOutput, sociMountString)
109111
}

pkg/config/lima_config_applier.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
)
2121

2222
const (
23-
sociVersion = "0.9.0"
24-
sociAMD64Sha256Sum = "deff4c4d5aeaf88cf658f487dbde800e4073f4714d55c36d20bd8097350173c9"
25-
sociARM64Sha256Sum = "836922af9284923934bcbd0e721fe6218d3acbe1c3ab150f5adca1f89496a276"
23+
sociVersion = "0.11.1"
24+
sociAMD64Sha256Sum = "52d72692880150f974a48dbfa44bff01f1a3ba97815658cc16f835e5e7f96d49"
25+
sociARM64Sha256Sum = "da055b182000dbac3e916a8c731cbc0d7a204791311260c94d960a1160d25b3e"
2626
snapshotterProvisioningScriptHeader = "# snapshotter provisioning script"
2727
sociInstallationProvisioningScriptHeader = snapshotterProvisioningScriptHeader + ": soci"
2828
sociFileNameFormat = "soci-snapshotter-%s-linux-%s.tar.gz"

0 commit comments

Comments
 (0)