From 5c27c7e304871ed4d09b653f374a5f33074f0b72 Mon Sep 17 00:00:00 2001 From: RobertKielty Date: Sun, 21 Jun 2020 18:25:16 +0100 Subject: [PATCH] renames CommmonImageWhiteList to PrePulledImages in e2e/common/util Part of work to remove racist language, this name change also improves on the semantics of this variable name as it was not actually a list of permissible images but rather a list of images that are required for e2e_node tests that are to be pre-pulled so that they are available prior to running e2e tests. Worth noting that this list of images is "union merged" with another list when setting up e2e_node tests and as such there is the possibilty for overlap. # Please enter the commit message for your changes. Lines starting --- test/e2e/common/util.go | 9 +++++---- test/e2e_node/image_list.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index a22f12886e9..43f3ff369b7 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -57,11 +57,12 @@ var ( // CurrentSuite represents current test suite. var CurrentSuite Suite -// CommonImageWhiteList is the list of images used in common test. These images should be prepulled -// before a tests starts, so that the tests won't fail due image pulling flakes. Currently, this is -// only used by node e2e test. +// PrePulledImages are a list of images used in e2e/common tests. These images should be prepulled +// before tests starts, so that the tests won't fail due image pulling flakes. +// Currently, this is only used by node e2e test. +// See also updateImageWhiteList() in ../../e2e_node/image_list.go // TODO(random-liu): Change the image puller pod to use similar mechanism. -var CommonImageWhiteList = sets.NewString( +var PrePulledImages = sets.NewString( imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.BusyBox), imageutils.GetE2EImage(imageutils.IpcUtils), diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index b05025b61c8..653f2388a06 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -67,7 +67,7 @@ var NodePrePullImageList = sets.NewString( // So this function needs to be called after the extra envs are applied. func updateImageWhiteList() { // Union NodePrePullImageList and CommonImageWhiteList into the framework image pre-pull list. - framework.ImageWhiteList = NodePrePullImageList.Union(commontest.CommonImageWhiteList) + framework.ImageWhiteList = NodePrePullImageList.Union(commontest.PrePulledImages) // Images from extra envs framework.ImageWhiteList.Insert(getNodeProblemDetectorImage()) framework.ImageWhiteList.Insert(getSRIOVDevicePluginImage())