Merge pull request #1388 from hj-johannes-lee/e2e-fix-aftereach

e2e: fix aftereach to be in the correct location
This commit is contained in:
Mikko Ylinen 2023-04-24 16:29:43 +03:00 committed by GitHub
commit 73e4750140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 24 deletions

View File

@ -85,14 +85,6 @@ func describe() {
}
})
ginkgo.Context("When DSA resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "dsa.intel.com/wq-user-dedicated", 300*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.AfterEach(func() {
ginkgo.By("undeploying DSA plugin")
e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "delete", "-k", filepath.Dir(kustomizationPath))
@ -101,6 +93,14 @@ func describe() {
}
})
ginkgo.Context("When DSA resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "dsa.intel.com/wq-user-dedicated", 300*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.It("deploys a demo app", func() {
e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-f", demoPath)

View File

@ -85,14 +85,6 @@ func describeQatDpdkPlugin() {
}
})
ginkgo.Context("When QAT Gen4 resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "qat.intel.com/cy", 30*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.AfterEach(func() {
ginkgo.By("undeploying QAT plugin")
e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "delete", "-k", filepath.Dir(kustomizationPath))
@ -101,6 +93,14 @@ func describeQatDpdkPlugin() {
}
})
ginkgo.Context("When QAT Gen4 resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "qat.intel.com/cy", 30*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.It("deploys a crypto pod requesting QAT resources", func() {
ginkgo.By("submitting a crypto pod requesting QAT resources")
e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-f", opensslTestYamlPath)
@ -113,6 +113,7 @@ func describeQatDpdkPlugin() {
framework.Logf("cpa_sample_code output:\n %s", output)
})
})
ginkgo.Context("When QAT Gen2 resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")

View File

@ -71,14 +71,6 @@ func describeQatKernelPlugin() {
}
})
ginkgo.Context("When QAT resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "qat.intel.com/cy1_dc0", 30*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.AfterEach(func() {
ginkgo.By("undeploying QAT plugin")
e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "delete", "-f", yamlPath)
@ -87,6 +79,14 @@ func describeQatKernelPlugin() {
}
})
ginkgo.Context("When QAT resources are available", func() {
ginkgo.BeforeEach(func() {
ginkgo.By("checking if the resource is allocatable")
if err := utils.WaitForNodesWithResource(f.ClientSet, "qat.intel.com/cy1_dc0", 30*time.Second); err != nil {
framework.Failf("unable to wait for nodes to have positive allocatable resource: %v", err)
}
})
ginkgo.It("deploys a pod requesting QAT resources", func() {
ginkgo.By("submitting a pod requesting QAT resources")
podSpec := &v1.Pod{