From 948001999edcc8b851376d3456de5c623e823ff1 Mon Sep 17 00:00:00 2001 From: Maksim An Date: Thu, 12 Aug 2021 15:25:53 -0700 Subject: [PATCH] tests: fix VPMem layer packing tests Previously ubuntu:18.04 container had 3 image layers, which is not true anymore. Pin image digest to make sure that this issue doesn't resurface. --- test/cri-containerd/container_layers_packing_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/cri-containerd/container_layers_packing_test.go b/test/cri-containerd/container_layers_packing_test.go index bf1178f8a4..664590bdaa 100644 --- a/test/cri-containerd/container_layers_packing_test.go +++ b/test/cri-containerd/container_layers_packing_test.go @@ -17,7 +17,7 @@ import ( ) const ( - ubuntu1804 = "ubuntu:18.04" + ubuntu1804 = "ubuntu@sha256:07782849f2cff04e9bc29449c27d0fb2076e61e8bdb4475ec5dbc5386ed41a4f" ubuntu70ExtraLayers = "cplatpublic.azurecr.io/ubuntu70extra:18.04" alpine70ExtraLayers = "cplatpublic.azurecr.io/alpine70extra:latest" ) @@ -116,8 +116,9 @@ func Test_Container_Layer_Packing_On_VPMem(t *testing.T) { startContainer(t, client, ctx, containerID) // check initial targets - // NOTE: as of 02/03/2021, ubuntu:18.04 image has 3 image layers and k8s pause container has 1 layer - validateTargets(ctx, t, scenario.deviceNumber, podID, 4) + // NOTE: as of 08/12/2021, ubuntu:18.04 (digest: sha256:07782849f2cff04e9bc29449c27d0fb2076e61e8bdb4475ec5dbc5386ed41a4f) + // image has 1 image layer and k8s pause container has 1 layer + validateTargets(ctx, t, scenario.deviceNumber, podID, 2) // stop container stopContainer(t, client, ctx, containerID)