fix: e2e tests (#143)

Issue #, if available:

*Description of changes:*
- Fixes e2e tests by restarting BuildKit when containerd is restarted
(similar issue faced in runfinch/finch#461)
- Uses a more up to date yaml file for testing (will automatically
update the OS version too since that's included in the makefile)

*Testing done:*


- [x] I've reviewed the guidance in CONTRIBUTING.md


#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

---------

Signed-off-by: Justin Alvarez <[email protected]>

.github/workflows/ci.yaml

@@ -26,16 +26,19 @@ jobs:
         os: [[self-hosted, macos, amd64, 13, test], [self-hosted, macos, amd64, 12, test], [self-hosted, macos, arm64, 13, test], [self-hosted, macos, arm64, 12, test]]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           persist-credentials: false
           submodules: true
-      - uses: actions/setup-go@v4
+      - name: Setup go
+        uses: actions/setup-go@v4
         with:
           go-version-file: e2e/go.mod
-          cache: true
+          cache-dependency-path: e2e/go.sum
       - name: Clean up previous files
+        shell: zsh {0}
         run: |
           sudo rm -rf ~/.lima
           sudo rm -rf ./_output
@@ -45,11 +48,17 @@ jobs:
           if pgrep '^socket_vmnet'; then
             sudo pkill '^socket_vmnet'
           fi
+      - name: Install dependencies
+        shell: zsh {0}
+        run: brew install go lz4 automake autoconf libtool
       - name: Build project
+        shell: zsh {0}
         run: |
           export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
           which libtool
           # Install socket_vmnet to `_output/bin` which is used in $PATH
           SOCKET_VMNET_TEMP_PREFIX=$(pwd)/_output/ make lima-socket-vmnet
-          make install.lima-dependencies 
-      - run: make test-e2e
+          make install.lima-dependencies binaries
+      - name: Run e2e tests
+        shell: zsh {0}
+        run: make test-e2e

e2e/e2e_test.go

@@ -38,7 +38,7 @@ func TestE2e(t *testing.T) {
 		t.Fatalf("failed to get the current working directory: %v", err)
 	}
 	subject := "limactl"
-	vmConfigFile := filepath.Join(wd, "./fedora.yaml")
+	vmConfigFile := filepath.Join(wd, "./../_output/lima-template/fedora.yaml")
 	vmName := "fedora"
 	o, err := option.New([]string{subject})
 

e2e/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
-	github.com/runfinch/common-tests v0.7.1
+	github.com/runfinch/common-tests v0.7.2
 )
 
 require (

e2e/go.sum

@@ -20,8 +20,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/runfinch/common-tests v0.7.1 h1:MQP1W9n6T6OlZu32uw3efZzdztxj1F4Qa/weKf5Was0=
-github.com/runfinch/common-tests v0.7.1/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4=
+github.com/runfinch/common-tests v0.7.2 h1:LYZkxcFpcsoS4ZiXZ5l4aInncmKere+s5SB89QoJx28=
+github.com/runfinch/common-tests v0.7.2/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=