@@ -20,7 +20,7 @@ import (
2020)
2121
2222const (
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\n memory: 4GiB\n snapshotters:\n " +
6970 "- soci\n vmType: %s\n rosetta: 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.
106108func 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}
0 commit comments