e2e: fix FPGA tests

Fixes: #419

Author: bart0sh

test/e2e/fpga/fpga.go

@@ -35,49 +35,42 @@ import (
 )
 
 const (
-	pluginKustomizationYaml  = "deployments/fpga_plugin/base/kustomization.yaml"
-	webhookKustomizationYaml = "deployments/fpga_admissionwebhook/default/kustomization.yaml"
-	nlb0NodeResource         = "fpga.intel.com/af-695.d84.aVKNtusxV3qMNmj5-qCB9thCTcSko8QT-J5DNoP5BAs"
-	nlb0PodResource          = "fpga.intel.com/arria10.dcp1.2-nlb0-orchestrated"
-	nlb3PodResource          = "fpga.intel.com/arria10.dcp1.2-nlb3-orchestrated"
-	nlb0PodResourceAF        = "fpga.intel.com/arria10.dcp1.2-nlb0-preprogrammed"
-	arria10NodeResource      = "fpga.intel.com/region-69528db6eb31577a8c3668f9faa081f6"
+	pluginKustomizationYaml = "deployments/fpga_plugin/base/kustomization.yaml"
+	mappingsCollectionYaml  = "deployments/fpga_admissionwebhook/mappings-collection.yaml"
+	nlb0NodeResource        = "fpga.intel.com/af-695.d84.aVKNtusxV3qMNmj5-qCB9thCTcSko8QT-J5DNoP5BAs"
+	nlb0PodResource         = "fpga.intel.com/arria10.dcp1.2-nlb0-orchestrated"
+	nlb3PodResource         = "fpga.intel.com/arria10.dcp1.2-nlb3-orchestrated"
+	nlb0PodResourceAF       = "fpga.intel.com/arria10.dcp1.2-nlb0-preprogrammed"
+	arria10NodeResource     = "fpga.intel.com/region-69528db6eb31577a8c3668f9faa081f6"
 )
 
 func init() {
 	ginkgo.Describe("FPGA Plugin E2E tests", describe)
 }
 
 func describe() {
-	webhookKustomizationPath, err := utils.LocateRepoFile(webhookKustomizationYaml)
+	pluginKustomizationPath, err := utils.LocateRepoFile(pluginKustomizationYaml)
 	if err != nil {
-		framework.Failf("unable to locate %q: %v", webhookKustomizationYaml, err)
+		framework.Failf("unable to locate %q: %v", pluginKustomizationYaml, err)
 	}
 
-	pluginKustomizationPath, err := utils.LocateRepoFile(pluginKustomizationYaml)
+	mappingsCollectionPath, err := utils.LocateRepoFile(mappingsCollectionYaml)
 	if err != nil {
-		framework.Failf("unable to locate %q: %v", pluginKustomizationYaml, err)
+		framework.Failf("unable to locate %q: %v", mappingsCollectionYaml, err)
 	}
 
 	fmw := framework.NewDefaultFramework("fpgaplugin-e2e")
 
 	ginkgo.It("Run FPGA plugin tests", func() {
-		// Deploy webhook
-		ginkgo.By(fmt.Sprintf("namespace %s: deploying webhook", fmw.Namespace.Name))
-		utils.DeployFpgaWebhook(fmw, webhookKustomizationPath)
-
-		ginkgo.By("deploying mappings")
-		framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-n", fmw.Namespace.Name, "-f", filepath.Dir(webhookKustomizationPath)+"/../mappings-collection.yaml")
-
 		// Run region test case twice to ensure that device is reprogrammed at least once
-		runTestCase(fmw, pluginKustomizationPath, "region", arria10NodeResource, nlb3PodResource, "nlb3", "nlb0")
-		runTestCase(fmw, pluginKustomizationPath, "region", arria10NodeResource, nlb0PodResource, "nlb0", "nlb3")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "region", arria10NodeResource, nlb3PodResource, "nlb3", "nlb0")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "region", arria10NodeResource, nlb0PodResource, "nlb0", "nlb3")
 		// Run af test case
-		runTestCase(fmw, pluginKustomizationPath, "af", nlb0NodeResource, nlb0PodResourceAF, "nlb0", "nlb3")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "af", nlb0NodeResource, nlb0PodResourceAF, "nlb0", "nlb3")
 	})
 }
 
-func runTestCase(fmw *framework.Framework, pluginKustomizationPath, pluginMode, nodeResource, podResource, cmd1, cmd2 string) {
+func runTestCase(fmw *framework.Framework, pluginKustomizationPath, mappingsCollectionPath, pluginMode, nodeResource, podResource, cmd1, cmd2 string) {
 	tmpDir, err := ioutil.TempDir("", "fpgaplugine2etest-"+fmw.Namespace.Name)
 	if err != nil {
 		framework.Failf("unable to create temp directory: %v", err)
@@ -93,6 +86,9 @@ func runTestCase(fmw *framework.Framework, pluginKustomizationPath, pluginMode,
 	_, _ = framework.RunKubectl(fmw.Namespace.Name, "delete", "-k", tmpDir)
 	framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-k", tmpDir)
 
+	ginkgo.By("deploying mappings")
+	framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-n", fmw.Namespace.Name, "-f", mappingsCollectionPath)
+
 	waitForPod(fmw, "intel-fpga-plugin")
 
 	resource := v1.ResourceName(nodeResource)