Merge pull request #8807 from kwilczynski/fix/add-missing-property-to…

…-a-test [release-1.29] Fix failing test following a backport from cri-o/cri-o/pull#8795
cri-o · Dec 2, 2024 · 16d9bd6 · 16d9bd6
2 parents 2f4af70 + a7b8df4
commit 16d9bd6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 27 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -21,18 +21,9 @@ jobs:
         run:
           - runner: ubuntu-latest
             arch: amd64
-          - runner: actuated-arm64-4cpu-16gb
-            arch: arm64
     name: binaries / ${{ matrix.run.arch }}
     runs-on: ${{ matrix.run.runner }}
     steps:
-      - uses: alexellis/arkade-get@master
-        with:
-          crane: latest
-          print-summary: false
-      - name: Install vmmeter
-        run: crane export --platform linux/${{ matrix.run.arch }} ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
-      - uses: self-actuated/vmmeter-action@master
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
@@ -63,8 +54,6 @@ jobs:
         run:
           - runner: ubuntu-latest
             arch: amd64
-          - runner: actuated-arm64-8cpu-32gb
-            arch: arm64
         runtime:
           - name: conmon
             type: oci
@@ -73,13 +62,6 @@ jobs:
     name: critest / ${{ matrix.runtime.name }} / ${{ matrix.run.arch }}
     runs-on: ${{ matrix.run.runner }}
     steps:
-      - uses: alexellis/arkade-get@master
-        with:
-          crane: latest
-          print-summary: false
-      - name: Install vmmeter
-        run: crane export --platform linux/${{ matrix.run.arch }} ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
-      - uses: self-actuated/vmmeter-action@master
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -246,18 +246,9 @@ jobs:
         run:
           - runner: ubuntu-latest
             arch: amd64
-          - runner: actuated-arm64-4cpu-16gb
-            arch: arm64
     name: unit / ${{ matrix.run.arch }}
     runs-on: ${{ matrix.run.runner }}
     steps:
-      - uses: alexellis/arkade-get@master
-        with:
-          crane: latest
-          print-summary: false
-      - name: Install vmmeter
-        run: crane export --platform linux/${{ matrix.run.arch }} ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
-      - uses: self-actuated/vmmeter-action@master
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:

diff --git a/server/container_restore_test.go b/server/container_restore_test.go
@@ -375,6 +375,7 @@ var _ = t.Describe("ContainerRestore", func() {
 			_, err = io.Copy(outFile, input)
 			Expect(err).To(BeNil())
 			containerConfig := &types.ContainerConfig{
+				Metadata: &types.ContainerMetadata{Name: "name"},
 				Image: &types.ImageSpec{
 					Image: "archive.tar",
 				},